diff options
| author | 2024-09-05 21:57:47 +0000 | |
|---|---|---|
| committer | 2024-09-05 21:57:47 +0000 | |
| commit | ed34ba17d4d108047a7df000e8255c53e8e5d251 (patch) | |
| tree | b74149210ed2721b03fd26b45868b80bb81b54ac | |
| parent | 00789c637af2ba7f63f0e487d18bfeee8ed80b93 (diff) | |
| parent | b970a30c7c9b817e6b04fb5199053ca17ffd0afb (diff) | |
Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 2f2f76ba10e7..880f30c6cdc0 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -583,6 +583,8 @@ applications that come with the platform <!-- 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"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 720ec870b05c..f3c5a186563d 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" |