Merge Android 12

Bug: 202323961
Merged-In: I23caf789c37d9f74a372aa754d21cceb3f4649ad
Change-Id: If0575090720948ddecba4a1fb2aa8b10d5112da5

14 files changed, 46 insertions, 39 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 638c05d9..66a4a8a0 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,8 @@
 >
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.NFC_SET_CONTROLLER_ALWAYS_ON" />
diff --git a/nci/jni/NativeLlcpConnectionlessSocket.cpp b/nci/jni/NativeLlcpConnectionlessSocket.cpp
index e43dbff3..7506d80e 100644
--- a/nci/jni/NativeLlcpConnectionlessSocket.cpp
+++ b/nci/jni/NativeLlcpConnectionlessSocket.cpp
@@ -108,7 +108,7 @@ void nativeLlcpConnectionlessSocket_receiveData(uint8_t* data, uint32_t len,
       << StringPrintf("%s: waiting for data = %d, len = %d", __func__,
                       sConnlessRecvWaitingForData, len);
 
-  // Sanity...
+  // Quick check...
   if (sConnlessRecvLen < len) {
     len = sConnlessRecvLen;
   }
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 66bf6c6c..767e5f9f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,7 +25,7 @@
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Koppeln mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth konnte nicht aktiviert werden."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Möchtest du das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
-    <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"„Ja“"</string>
     <string name="pair_no" msgid="5022308368904055020">"Nein"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Halte dein Gerät erneut ans Terminal, um mit <xliff:g id="APP">%1$s</xliff:g> zu bezahlen."</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"Halte dein Gerät erneut ans Terminal, um den Vorgang mit <xliff:g id="APP">%1$s</xliff:g> durchzuführen."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 507ac44f..1d54adda 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -14,7 +14,7 @@
     <string name="beam_tap_to_view" msgid="7430394753262448349">"Sakatu ikusteko"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Hartzailearen gailuak ez du onartzen fitxategi handiak NFC bidez transferitzea."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Elkartu gailuak berriro"</string>
-    <string name="beam_busy" msgid="5253335587620612576">"Beam okupatuta dago. Saiatu berriro abian den transferentzia amaitutakoan."</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam lanpetuta dago. Saiatu berriro abian den transferentzia amaitutakoan."</string>
     <string name="device" msgid="4459621591392478151">"gailua"</string>
     <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatzen"</string>
     <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatu da"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b07dacdc..0ff52748 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="78565911793142902">"‏سرویس NFC"</string>
-    <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏مجهز به NFC."</string>
+    <string name="app_name" msgid="78565911793142902">"‏سرویس «ارتباط میدان نزدیک» (NFC)"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"‏ارتباط میدان نزدیک (NFC)"</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏مجهز به «ارتباط میدان نزدیک» (NFC)."</string>
     <string name="tap_to_beam" msgid="5819197866281059878">"برای ارسال پرتو ضربه بزنید"</string>
     <string name="beam_progress" msgid="7453634884807323920">"در حال دریافت پرتو..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"پرتو…"</string>
@@ -40,15 +40,15 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"مرتبط شد"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"اتصال به شبکه"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"به شبکه <xliff:g id="NETWORK_SSID">%1$s</xliff:g> متصل می‌شوید؟"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏Android Beam برای فعال شدن به NFC نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏Android Beam برای فعال شدن به «ارتباط میدان نزدیک» (NFC) نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
     <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"برنامه،ِ مجوز فضای ذخیره‌سازی خارجی را ندارد. این مجوز برای «پرتوی» فایل لازم است"</string>
     <string name="title_confirm_url_open" msgid="8069968913244794478">"پیوند باز شود؟"</string>
-    <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏رایانه لوحی‌تان پیوندی ازطریق NFC دریافت کرد:"</string>
-    <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏تلفنتان پیوندی ازطریق NFC دریافت کرد:"</string>
+    <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏رایانه لوحی‌تان پیوندی ازطریق «ارتباط میدان نزدیک» (NFC) دریافت کرد:"</string>
+    <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏تلفنتان پیوندی ازطریق «ارتباط میدان نزدیک» (NFC) دریافت کرد:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"باز کردن پیوند"</string>
     <string name="tag_read_error" msgid="2485274498885877547">"‏خطای خواندن «ارتباطات میدان‌نزدیک» (NFC). دوباره امتحان کنید."</string>
-    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏برنامه پشتیبانی‌شده‌ای برای نشان NFC وجود ندارد"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏برنامه پشتیبانی‌شده‌ای برای نشان «ارتباط میدان نزدیک» (NFC) وجود ندارد"</string>
     <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"‏ممکن است «ارتباطات میدان‌نزدیک» (NFC) مسدود باشد"</string>
     <string name="nfc_blocking_alert_message" msgid="7003156052570107490">"برای آشنایی با نحوه برطرف کردن مشکل، ضربه بزنید."</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 90930650..af307d7b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -35,10 +35,10 @@
     <string name="complete_with" msgid="6797459104103012992">"सँग समाप्त गर्नुहोस्"</string>
     <string name="default_pay_app_removed" msgid="4108250545457437360">"तपाईँको प्राथमिकमा पर्ने Tap &amp; Pay सेवा हटाइयो। अर्को चयन गर्नुहुन्छ?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"पूरा गर्नको लागि अर्को उपकरण ट्याप गर्नुहोस्"</string>
-    <string name="wifi_connect" msgid="6250727951843550671">"कनेक्ट गर्नुहोस्"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"जडान गर्नुहोस्"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"सञ्जालसँग जडान गर्न असक्षम भयो"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"जोडिएको"</string>
-    <string name="title_connect_to_network" msgid="2474034615817280146">"सञ्जालमा कनेक्ट गर्नुहोस्"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"सञ्जालमा जडान गर्नुहोस्"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"सञ्जाल <xliff:g id="NETWORK_SSID">%1$s</xliff:g>मा जडान गर्ने?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android बीम सक्षम गर्नको लागि NFC आवश्यक छ। के तपाईं यसलाई सक्षम गर्न चाहनुहुन्छ?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android बिम"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index dc46fa47..5f81d8ab 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -10,7 +10,7 @@
     <string name="beam_complete" msgid="477026736424637435">"ବିମ୍‌ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ବିମ୍‌ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା ନାହିଁ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ବିମ୍‌ ବାତିଲ୍‌ ହୋଇଛି"</string>
-    <string name="cancel" msgid="61873902552555096">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="cancel" msgid="61873902552555096">"ବାତିଲ୍‍"</string>
     <string name="beam_tap_to_view" msgid="7430394753262448349">"ଦେଖିବା ପାଇଁ ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ପ୍ରାପ୍ତକର୍ତ୍ତାଙ୍କ ଡିଭାଇସ୍‌, ବିମ୍‌ ମାଧ୍ୟମରେ ବଡ଼ ସାଇଜ୍‌ର ଫାଇଲ୍ ଟ୍ରାନ୍ସଫର‌୍‌ ସପୋର୍ଟ କରେନାହିଁ।"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ପୁଣି ଏକାଠି କରନ୍ତୁ"</string>
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index bc66ca98..7215e7fb 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -368,7 +368,7 @@ class NfcDispatcher {
                 // We only allow NDEF-message dispatch in provisioning mode
                 return DISPATCH_FAIL;
             }
-            // Restrict to mime-types in whitelist.
+            // Restrict to mime-types in allowlist.
             String ndefMimeType = message.getRecords()[0].toMimeType();
             if (provisioningMimes == null ||
                     !(Arrays.asList(provisioningMimes).contains(ndefMimeType))) {
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index febdda5f..e52cd608 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -144,8 +144,8 @@ public class NfcService implements DeviceHostListener {
     static final String TRON_NFC_P2P = "nfc_p2p";
     static final String TRON_NFC_TAG = "nfc_tag";
 
-    static final String NATIVE_LOG_FILE_PATH = "/data/misc/nfc/logs";
     static final String NATIVE_LOG_FILE_NAME = "native_crash_logs";
+    static final String NATIVE_LOG_FILE_PATH = "/data/misc/nfc/logs";
     static final int NATIVE_CRASH_FILE_SIZE = 1024 * 1024;
 
     static final int MSG_NDEF_TAG = 0;
@@ -713,7 +713,7 @@ public class NfcService implements DeviceHostListener {
     class EnableDisableTask extends AsyncTask<Integer, Void, Void> {
         @Override
         protected Void doInBackground(Integer... params) {
-            // Sanity check mState
+            // Quick check mState
             switch (mState) {
                 case NfcAdapter.STATE_TURNING_OFF:
                 case NfcAdapter.STATE_TURNING_ON:
@@ -3434,7 +3434,7 @@ public class NfcService implements DeviceHostListener {
         proto.end(token);
 
         // Dump native crash logs if any
-        File file = new File(getNfaStorageDir(), NATIVE_LOG_FILE_NAME);
+        File file = new File(NATIVE_LOG_FILE_PATH, NATIVE_LOG_FILE_NAME);
         if (!file.exists()) {
             return;
         }
diff --git a/src/com/android/nfc/NfcWifiProtectedSetup.java b/src/com/android/nfc/NfcWifiProtectedSetup.java
index af4dd6f6..a078efcd 100644
--- a/src/com/android/nfc/NfcWifiProtectedSetup.java
+++ b/src/com/android/nfc/NfcWifiProtectedSetup.java
@@ -121,7 +121,7 @@ public final class NfcWifiProtectedSetup {
             short fieldId = payload.getShort();
             int fieldSize = payload.getShort() & 0xFFFF;
 
-            // sanity check
+            // Quick check
             if (payload.position() + fieldSize > startPosition + size) {
                 return null;
             }
diff --git a/src/com/android/nfc/beam/BeamManager.java b/src/com/android/nfc/beam/BeamManager.java
index f1ec8360..9917ebd0 100644
--- a/src/com/android/nfc/beam/BeamManager.java
+++ b/src/com/android/nfc/beam/BeamManager.java
@@ -40,7 +40,7 @@ public class BeamManager implements Handler.Callback {
     private static final boolean DBG =
             SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
 
-    private static final String ACTION_WHITELIST_DEVICE =
+    private static final String ACTION_ALLOWLIST_DEVICE =
             "android.btopp.intent.action.WHITELIST_DEVICE";
     public static final int MSG_BEAM_COMPLETE = 0;
 
@@ -91,7 +91,7 @@ public class BeamManager implements Handler.Callback {
         receiveIntent.putExtra(BeamReceiveService.EXTRA_BEAM_TRANSFER_RECORD, transferRecord);
         receiveIntent.putExtra(BeamReceiveService.EXTRA_BEAM_COMPLETE_CALLBACK,
                 new Messenger(mCallback));
-        whitelistOppDevice(context, handoverData.device);
+        allowlistOppDevice(context, handoverData.device);
         context.startServiceAsUser(receiveIntent, UserHandle.CURRENT);
         return true;
     }
@@ -135,9 +135,9 @@ public class BeamManager implements Handler.Callback {
         return false;
     }
 
-    void whitelistOppDevice(Context context, BluetoothDevice device) {
-        if (DBG) Log.d(TAG, "Whitelisting " + device + " for BT OPP");
-        Intent intent = new Intent(ACTION_WHITELIST_DEVICE);
+    void allowlistOppDevice(Context context, BluetoothDevice device) {
+        if (DBG) Log.d(TAG, "Allowlist " + device + " for BT OPP");
+        Intent intent = new Intent(ACTION_ALLOWLIST_DEVICE);
         intent.setPackage(context.getString(R.string.bluetooth_package));
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java
index d728864b..cb59c280 100644
--- a/src/com/android/nfc/beam/BeamTransferManager.java
+++ b/src/com/android/nfc/beam/BeamTransferManager.java
@@ -105,7 +105,7 @@ public class BeamTransferManager implements Handler.Callback,
 
     static final String BEAM_NOTIFICATION_CHANNEL = "beam_notification_channel";
 
-    static final String ACTION_WHITELIST_DEVICE =
+    static final String ACTION_ALLOWLIST_DEVICE =
             "android.btopp.intent.action.WHITELIST_DEVICE";
 
     static final String ACTION_STOP_BLUETOOTH_TRANSFER =
@@ -180,9 +180,9 @@ public class BeamTransferManager implements Handler.Callback,
         mNotificationManager.createNotificationChannel(notificationChannel);
     }
 
-    void whitelistOppDevice(BluetoothDevice device) {
-        if (DBG) Log.d(TAG, "Whitelisting " + device + " for BT OPP");
-        Intent intent = new Intent(ACTION_WHITELIST_DEVICE);
+    void allowlistOppDevice(BluetoothDevice device) {
+        if (DBG) Log.d(TAG, "Allowlist " + device + " for BT OPP");
+        Intent intent = new Intent(ACTION_ALLOWLIST_DEVICE);
         intent.setPackage(mContext.getString(R.string.bluetooth_package));
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
@@ -212,8 +212,8 @@ public class BeamTransferManager implements Handler.Callback,
         this.mProgress = progress;
 
         // We're still receiving data from this device - keep it in
-        // the whitelist for a while longer
-        if (mIncoming && mRemoteDevice != null) whitelistOppDevice(mRemoteDevice);
+        // the allowlist for a while longer
+        if (mIncoming && mRemoteDevice != null) allowlistOppDevice(mRemoteDevice);
 
         updateStateAndNotification(STATE_IN_PROGRESS);
     }
@@ -554,4 +554,3 @@ public class BeamTransferManager implements Handler.Callback,
         return newFile;
     }
 }
-
diff --git a/src/com/android/nfc/beam/SendUi.java b/src/com/android/nfc/beam/SendUi.java
index 49f893c2..22457295 100644
--- a/src/com/android/nfc/beam/SendUi.java
+++ b/src/com/android/nfc/beam/SendUi.java
@@ -18,9 +18,6 @@ package com.android.nfc.beam;
 
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 
-import com.android.nfc.R;
-import com.android.nfc.beam.FireflyRenderer;
-
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -42,6 +39,7 @@ import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.os.AsyncTask;
 import android.os.Binder;
+import android.os.IBinder;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.ActionMode;
@@ -52,7 +50,6 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
-import com.android.internal.policy.PhoneWindow;
 import android.view.SearchEvent;
 import android.view.Surface;
 import android.view.SurfaceControl;
@@ -68,7 +65,9 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import com.android.internal.policy.PhoneWindow;
+import com.android.nfc.R;
+import com.android.nfc.beam.FireflyRenderer;
 import java.util.List;
 
 /**
@@ -613,8 +612,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener,
                 mDisplayMetrics.heightPixels);
         float smallestWidthDp = smallestWidth / (mDisplayMetrics.densityDpi / 160f);
 
-        int rot = mDisplay.getRotation();
-
         // TODO this is somewhat device-specific; need generic solution.
         // The starting crop for the screenshot is the fullscreen without the status bar, which
         // is always on top. The conditional check will determine how to crop the navbar,
@@ -639,7 +636,16 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener,
         int height = crop.height();
         // Take the screenshot. SurfaceControl will generate a hardware bitmap in the correct
         // orientation and size.
-        Bitmap bitmap = SurfaceControl.screenshot(crop, width, height, rot);
+        IBinder displayToken = SurfaceControl.getInternalDisplayToken();
+        final SurfaceControl.DisplayCaptureArgs captureArgs =
+                new SurfaceControl.DisplayCaptureArgs.Builder(displayToken)
+                        .setSourceCrop(crop)
+                        .setSize(width, height)
+                        .build();
+        SurfaceControl.ScreenshotHardwareBuffer screenshotBuffer =
+                SurfaceControl.captureDisplay(captureArgs);
+        final Bitmap bitmap = screenshotBuffer == null ? null : screenshotBuffer.asBitmap();
+
         // Bail if we couldn't take the screenshot
         if (bitmap == null) {
             return null;
diff --git a/src/com/android/nfc/cardemulation/PreferredServices.java b/src/com/android/nfc/cardemulation/PreferredServices.java
index e51f6fc1..128e450c 100644
--- a/src/com/android/nfc/cardemulation/PreferredServices.java
+++ b/src/com/android/nfc/cardemulation/PreferredServices.java
@@ -236,7 +236,7 @@ public class PreferredServices implements com.android.nfc.ForegroundUtils.Callba
             Log.d(TAG, "Requested foreground service unexpectedly removed");
             return false;
         }
-        // Do some sanity checking
+        // Do some quick checking
         if (!mPaymentDefaults.preferForeground) {
             // Foreground apps are not allowed to override payment default
             // Check if this app registers payment AIDs, in which case we'll fail anyway