Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15973a18 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

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

This reverts commit a686b931.

Reason for revert: breaks all the tests

Change-Id: I800de434b6b4ecf0c132fb36025ab800ebe28b0f
parent a686b931

services/tests/uiservicestests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -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",

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

+7 −9
Original line number Diff line number Diff line
@@ -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);

    }

}