From a686b9310cc5f09ded5f0b68d1950a23f062a649 Mon Sep 17 00:00:00 2001 From: Stanislav Zholnin Date: Thu, 7 Mar 2019 17:30:30 +0000 Subject: [PATCH] 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: I65fc4a7b40df04e56f9676e6c296e86809292d29 --- services/tests/uiservicestests/Android.bp | 1 + .../NotificationManagerServiceTest.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp index 92198fa8cb0c2..0ef2d15407ff1 100644 --- a/services/tests/uiservicestests/Android.bp +++ b/services/tests/uiservicestests/Android.bp @@ -18,6 +18,7 @@ android_test { "services.usage", "guava", "androidx.test.rules", "hamcrest-library", + "compatibility-device-util-axt", "mockito-target-inline-minus-junit4", "platform-test-annotations", "hamcrest-library", 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 7df52b2ae06a1..49d8ad04de0eb 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -42,6 +42,8 @@ import static android.os.Build.VERSION_CODES.P; import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE; import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL; +import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; @@ -4178,7 +4180,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setNotificationAssistantAccessGrantedCallback( mNotificationAssistantAccessGrantedCallback); - mService.setDefaultAssistantForUser(0); + runWithShellPermissionIdentity(() -> mService.setDefaultAssistantForUser(0)); verify(mNotificationAssistantAccessGrantedCallback) .onGranted(eq(xmlConfig), eq(0), eq(true)); @@ -4198,7 +4200,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setNotificationAssistantAccessGrantedCallback( mNotificationAssistantAccessGrantedCallback); - mService.setDefaultAssistantForUser(0); + runWithShellPermissionIdentity(() -> mService.setDefaultAssistantForUser(0)); verify(mNotificationAssistantAccessGrantedCallback) .onGranted(eq(deviceConfig), eq(0), eq(true)); @@ -4219,22 +4221,22 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setNotificationAssistantAccessGrantedCallback( mNotificationAssistantAccessGrantedCallback); - mService.setDefaultAssistantForUser(0); + runWithShellPermissionIdentity(() -> mService.setDefaultAssistantForUser(0)); verify(mNotificationAssistantAccessGrantedCallback) .onGranted(eq(xmlConfig), eq(0), eq(true)); } private void clearDeviceConfig() { - DeviceConfig.resetToDefaults( - Settings.RESET_MODE_PACKAGE_DEFAULTS, DeviceConfig.NAMESPACE_SYSTEMUI); + runWithShellPermissionIdentity(() -> DeviceConfig.resetToDefaults( + Settings.RESET_MODE_PACKAGE_DEFAULTS, DeviceConfig.NAMESPACE_SYSTEMUI)); } private void setDefaultAssistantInDeviceConfig(String componentName) { - DeviceConfig.setProperty( + runWithShellPermissionIdentity(() -> DeviceConfig.setProperty( DeviceConfig.NAMESPACE_SYSTEMUI, SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE, componentName, - false); + false)); } }