Merge tag 'android-13.0.0_r35' into t13.0

Android 13.0.0 release 35

Change-Id: Ieedf15cdcb95a733ce06696b3da4a2c0eea45567

6 files changed, 8 insertions, 13 deletions

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index b622de5b..28537063 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -35,7 +35,7 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> ব্যৱহাৰ কৰিব পৰা নগ\'ল৷"</string>
     <string name="pay_with" msgid="5531545488795798945">"ইয়াৰ জৰিয়তে পৰিশোধ কৰক"</string>
     <string name="complete_with" msgid="6797459104103012992">"ইয়াৰ জৰিয়তে সম্পূৰ্ণ কৰক"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"আপোনাৰ পচন্দৰ \'টিপক আৰু পৰিশোধ কৰক\' এপটো আঁতৰোৱা হৈছে৷ অন্য এটা বাছনি কৰিবনে?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"আপোনাৰ পচন্দৰ \'টিপক আৰু পৰিশোধ কৰক\' এপ্‌টো আঁতৰোৱা হৈছে৷ অন্য এটা বাছনি কৰিবনে?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"সম্পূৰ্ণ কৰিবলৈ অন্য এটা ডিভাইচত টিপক"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"সংযোগ কৰক"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"নেটৱৰ্কৰ লগত সংযোগ কৰিব পৰা নগ\'ল"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f444a104..b7798685 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -42,7 +42,7 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Connecté"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Se connecter au réseau"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Se connecter au réseau <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ?"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'activation de la NFC est nécessaire pour utiliser Android Beam. Voulez-vous l\'activer ?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'activation de le NFC est nécessaire pour utiliser Android Beam. Voulez-vous l\'activer ?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
     <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"L\'application n\'est pas autorisée à accéder à l\'espace de stockage externe. Or, cette autorisation est requise pour partager ce fichier."</string>
     <string name="title_confirm_url_open" msgid="8069968913244794478">"Ouvrir le lien ?"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 439c9ae4..359e6c3b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,7 +29,7 @@
     <string name="pair_no" msgid="5022308368904055020">"Không"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Nhấn lại để thanh toán bằng <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"Nhấn lại để hoàn tất bằng <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="tap_again_description" msgid="3019101527041529661">"Đưa vào gần đầu đọc"</string>
+    <string name="tap_again_description" msgid="3019101527041529661">"Đưa vào máy đọc thẻ"</string>
     <string name="appchooser_description" msgid="2554187931814833244">"Chọn ứng dụng để quét"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"Không thể hoàn tất giao dịch này bằng <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"Không thể sử dụng <xliff:g id="APP">%1$s</xliff:g>."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 73a6a342..be14e656 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -35,7 +35,7 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"无法使用“<xliff:g id="APP">%1$s</xliff:g>”。"</string>
     <string name="pay_with" msgid="5531545488795798945">"付款方式："</string>
     <string name="complete_with" msgid="6797459104103012992">"使用以下应用完成操作："</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"用于触碰付款的首选服务已遭删除，您要选择使用其他服务吗？"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"用于感应式付款的首选服务已遭删除，您要选择使用其他服务吗？"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"请点按其他设备来完成操作"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"连接"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"无法连接到网络"</string>
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 4cdcaf42..aadbf1c5 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1048,17 +1048,12 @@ public class NfcService implements DeviceHostListener {
                 updateAlwaysOnState(NfcAdapter.STATE_OFF);
             } else if (mState == NfcAdapter.STATE_OFF) {
                 /* Special case when mState is OFF but NFCC is already initialized.
-                 * Temperatorily enable NfcAdapter without initialize NFCC and applyRouting.
-                 * And disable NfcAdapter normally with deinitialize.
-                 * All state will switch back to OFF in the end.
+                 * Deinitialize mDevicehost directly.
                  */
                 updateAlwaysOnState(NfcAdapter.STATE_TURNING_OFF);
                 mDeviceHost.setNfceePowerAndLinkCtrl(false);
-                if (!enableInternal()) {
-                    updateAlwaysOnState(NfcAdapter.STATE_OFF);
-                    return;
-                }
-                disableInternal();
+                boolean result = mDeviceHost.deinitialize();
+                if (DBG) Log.d(TAG, "mDeviceHost.deinitialize() = " + result);
                 updateAlwaysOnState(NfcAdapter.STATE_OFF);
             }
         }
diff --git a/tests/unit/src/com/android/nfc/NfcStateTest.java b/tests/unit/src/com/android/nfc/NfcStateTest.java
index 26f93a4b..50b8eea2 100644
--- a/tests/unit/src/com/android/nfc/NfcStateTest.java
+++ b/tests/unit/src/com/android/nfc/NfcStateTest.java
@@ -86,7 +86,7 @@ public final class NfcStateTest {
     @After
     public void tearDown() throws Exception {
         mContext.unregisterReceiver(mAdapterStateChangedReceiver);
-        if (mNfcAdapter.isControllerAlwaysOnSupported()) {
+        if (mNfcSupported && mNfcAdapter.isControllerAlwaysOnSupported()) {
             mNfcAdapter.unregisterControllerAlwaysOnListener(mListener);
         }
     }