Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission""

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-11 17:26:00 +00:00
committed by Android (Google) Code Review
parent 80bd5fe22e 15973a18f3
commit 5db3fb88af
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/tests/uiservicestests/Android.bp
View File

@@ -18,7 +18,6 @@ android_test {
"services.usage",
"guava",
"androidx.test.rules", "hamcrest-library",
"compatibility-device-util-axt",
"mockito-target-inline-minus-junit4",
"platform-test-annotations",
"hamcrest-library",

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

@@ -42,8 +42,6 @@ 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;
@@ -4180,7 +4178,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mService.setNotificationAssistantAccessGrantedCallback(
mNotificationAssistantAccessGrantedCallback);
runWithShellPermissionIdentity(() -> mService.setDefaultAssistantForUser(0));
mService.setDefaultAssistantForUser(0);
verify(mNotificationAssistantAccessGrantedCallback)
.onGranted(eq(xmlConfig), eq(0), eq(true));
@@ -4200,7 +4198,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mService.setNotificationAssistantAccessGrantedCallback(
mNotificationAssistantAccessGrantedCallback);
runWithShellPermissionIdentity(() -> mService.setDefaultAssistantForUser(0));
mService.setDefaultAssistantForUser(0);
verify(mNotificationAssistantAccessGrantedCallback)
.onGranted(eq(deviceConfig), eq(0), eq(true));
@@ -4221,22 +4219,22 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mService.setNotificationAssistantAccessGrantedCallback(
mNotificationAssistantAccessGrantedCallback);
runWithShellPermissionIdentity(() -> mService.setDefaultAssistantForUser(0));
mService.setDefaultAssistantForUser(0);
verify(mNotificationAssistantAccessGrantedCallback)
.onGranted(eq(xmlConfig), eq(0), eq(true));
}
private void clearDeviceConfig() {
runWithShellPermissionIdentity(() -> DeviceConfig.resetToDefaults(
Settings.RESET_MODE_PACKAGE_DEFAULTS, DeviceConfig.NAMESPACE_SYSTEMUI));
DeviceConfig.resetToDefaults(
Settings.RESET_MODE_PACKAGE_DEFAULTS, DeviceConfig.NAMESPACE_SYSTEMUI);
}
private void setDefaultAssistantInDeviceConfig(String componentName) {
runWithShellPermissionIdentity(() -> DeviceConfig.setProperty(
DeviceConfig.setProperty(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE,
componentName,
false));
false);
}
}