diff options
| author | 2024-03-14 04:00:58 +0000 | |
|---|---|---|
| committer | 2024-03-14 04:00:58 +0000 | |
| commit | 42ca889a6e19a437112ad7d775d554db7d3a4ee4 (patch) | |
| tree | 621ed696b4f420b4ac483c5fdffe72bb28f84a2a | |
| parent | 49231bb93d5eb9a11fe0ebe9642a96fc87c15c74 (diff) | |
| parent | 8e5580b5dd55c2deebdce3dfd7d6ccf54aa54c68 (diff) | |
Merge "Fix AppOpsStartedWatcherTest" into main
| -rw-r--r-- | services/tests/servicestests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/appop/AppOpsStartedWatcherTest.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index 0089d4cafaad..2724149d859f 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -111,6 +111,8 @@ <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" /> <uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION" /> <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" /> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> + <uses-permission android:name="android.permission.CAMERA" /> <queries> <package android:name="com.android.servicestests.apps.suspendtestapp" /> diff --git a/services/tests/servicestests/src/com/android/server/appop/AppOpsStartedWatcherTest.java b/services/tests/servicestests/src/com/android/server/appop/AppOpsStartedWatcherTest.java index 2890078f7638..8a6ba4d484f7 100644 --- a/services/tests/servicestests/src/com/android/server/appop/AppOpsStartedWatcherTest.java +++ b/services/tests/servicestests/src/com/android/server/appop/AppOpsStartedWatcherTest.java @@ -67,7 +67,6 @@ public class AppOpsStartedWatcherTest { // Start some ops appOpsManager.startOp(AppOpsManager.OP_FINE_LOCATION); appOpsManager.startOp(AppOpsManager.OP_CAMERA); - appOpsManager.startOp(AppOpsManager.OP_RECORD_AUDIO); // Verify that we got called for the ops being started final InOrder inOrder = inOrder(listener); |