commit b970a30c7c9b817e6b04fb5199053ca17ffd0afb
author Roshan Pius <rpius@google.com> Wed Sep 04 18:33:07 2024 +0000
committer Roshan Pius <rpius@google.com> Thu Sep 05 20:15:33 2024 +0000
tree f2e48d2099c85bada1beafa08510479b58409026
parent db6f2b27bf272aefbe3633149b541d7b41e0c734

shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing

Bug: 331563246
Change-Id: Id0233a614491173d48f6111fd0ef4bd9ce50d4a9
Test: atest CtsNfcTestCases
Flag: NONE test changes

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 2f2f76b..880f30c 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -583,6 +583,8 @@
         <!-- Permissions required for CTS test - AppFunctionManagerTest -->
         <permission name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED" />
         <permission name="android.permission.EXECUTE_APP_FUNCTIONS" />
+        <!-- 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 720ec87..f3c5a18 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -945,6 +945,9 @@
     <uses-permission android:name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED" />
     <uses-permission android:name="android.permission.EXECUTE_APP_FUNCTIONS" />
 
+    <!-- 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"