diff options
| author | 2024-09-05 22:04:24 +0000 | |
|---|---|---|
| committer | 2024-09-05 23:13:13 +0000 | |
| commit | b69a4ed2bb223d4b40b1b217495c0c00845e20ce (patch) | |
| tree | 55ca2f4c15f3606c01504965d6fb2cea5d965f37 | |
| parent | 952d275cdd0be810d065ca642a0203ad07366c29 (diff) | |
| parent | 03c81cdc754ba027aa50f3e1944b44c9d8b0ff20 (diff) | |
[conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main am: 03c81cdc75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3254877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: Id0233a614491173d48f6111fd0ef4bd9ce50d4a9
Change-Id: I970c29974712e3aab744cd7bd21411217ae64881
| -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 1fe6ca7dc14f..b8bed92c7baa 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -580,6 +580,8 @@ applications that come with the platform <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"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 0b5187c44821..18dd5c10384f 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" |