summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stanislav Zholnin <zholnin@google.com> 2019-03-12 15:57:25 +0000
committer Stanislav Zholnin <zholnin@google.com> 2019-03-12 15:57:25 +0000
commit872afd481b709b4f3d8a65ad6407677ed30b515c (patch)
treee531f3ee7717b203f002b5f22baece6e27e526dd
parent4808233a44d228e892a278401fc7ac26789bb02e (diff)
Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission
identity in preparation to enforcement of permissions through ag/6055289. Bug:117663715 Test: atest NotificationManagerServiceTest with ag/6055289 patched in. Change-Id: I753fe86a806ba830bfd71f6fa04bf2d2d4505ae0
-rw-r--r--services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java6
1 files changed, 6 insertions, 0 deletions
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 7df52b2ae06a..4626840e6263 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -117,6 +117,7 @@ import android.util.ArraySet;
import android.util.AtomicFile;
import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
import com.android.internal.R;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
@@ -311,6 +312,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Before
public void setUp() throws Exception {
+ InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+ "android.permission.WRITE_DEVICE_CONFIG", "android.permission.READ_DEVICE_CONFIG");
+
MockitoAnnotations.initMocks(this);
LocalServices.removeServiceForTest(UriGrantsManagerInternal.class);
@@ -392,6 +396,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void tearDown() throws Exception {
mFile.delete();
clearDeviceConfig();
+ InstrumentationRegistry.getInstrumentation()
+ .getUiAutomation().dropShellPermissionIdentity();
}
public void waitForIdle() {