commit b4358fdfd5777325afc6c7987bf00d6e705a33f5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 19 16:15:01 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 16:15:01 2020 +0000
tree ccea011e71fc4851c49781ba951ff2723b847c42
parent ceba44649f9a3c500207d25bc02d5fd226789d6f
parent 24d103b16af46f7a2b94b5777fe87f2871958d30

Merge "Add READ_CONTACTS permission to NoManSerTest shell"

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index 604fcd3..ccce043 100755
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -359,8 +359,12 @@
 
     @Before
     public void setUp() throws Exception {
+        // Shell permisssions will override permissions of our app, so add all necessary permissions
+        // fo this test here:
         InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
-                "android.permission.WRITE_DEVICE_CONFIG", "android.permission.READ_DEVICE_CONFIG");
+                "android.permission.WRITE_DEVICE_CONFIG",
+                "android.permission.READ_DEVICE_CONFIG",
+                "android.permission.READ_CONTACTS");
 
         MockitoAnnotations.initMocks(this);