commit 6f4fcdf625b9dd9e5f71535094095f5a7b2efe80
author Xin Li <delphij@google.com> Thu Sep 05 17:15:51 2024 -0700
committer Xin Li <delphij@google.com> Thu Sep 05 17:15:51 2024 -0700
tree 55ca2f4c15f3606c01504965d6fb2cea5d965f37
parent 03c81cdc754ba027aa50f3e1944b44c9d8b0ff20
parent 952d275cdd0be810d065ca642a0203ad07366c29

Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ic436003390c8feb4c5e9a36106abc1f7ab7f5a46
Change-Id: Ia2b25ed6f7c14923b93289c6260a50b1043848d8

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 1fe6ca7..b8bed92 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -580,6 +580,8 @@
         <permission name="android.permission.PREPARE_FACTORY_RESET" />
         <!-- Permission required for CTS test - FileIntegrityManagerTest -->
         <permission name="android.permission.SETUP_FSVERITY" />
+        <!-- Permission required for CTS test - CtsNfcTestCases -->
+        <permission name="android.permission.NFC_SET_CONTROLLER_ALWAYS_ON" />
     </privapp-permissions>
 
     <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 0b5187c..18dd5c1 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -941,6 +941,9 @@
     <!-- Permission required for CTS test - FileIntegrityManagerTest -->
     <uses-permission android:name="android.permission.SETUP_FSVERITY" />
 
+    <!-- Permission required for CTS test - CtsNfcTestCases -->
+    <uses-permission android:name="android.permission.NFC_SET_CONTROLLER_ALWAYS_ON" />
+
     <application
         android:label="@string/app_label"
         android:theme="@android:style/Theme.DeviceDefault.DayNight"