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

Commit 8ff1f0ac authored by Preston O'Neal's avatar Preston O'Neal Committed by Jay Aliomer
Browse files

Revert "Override default assistant" 

This reverts commit fe7f088a.

Reason for revert: Seems to be causing boot failures (b/144864188)

Change-Id: I672639a1f7a41c7c4b75d21e9ff048a8691f06fb
parent fd4b96a0

services/core/java/com/android/server/notification/NotificationManagerService.java

+12 −3
Original line number Diff line number Diff line
@@ -573,6 +573,13 @@ public class NotificationManagerService extends SystemService { 




        ArraySet<String> assistants = new ArraySet<>();

        String deviceAssistant = DeviceConfig.getProperty(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE);

        if (deviceAssistant != null) {

            assistants.addAll(Arrays.asList(deviceAssistant.split(

                    ManagedServices.ENABLED_SERVICES_SEPARATOR)));

        }

        assistants.addAll(Arrays.asList(getContext().getResources().getString(

                com.android.internal.R.string.config_defaultAssistantAccessComponent)

                .split(ManagedServices.ENABLED_SERVICES_SEPARATOR)));
@@ -604,9 +611,11 @@ public class NotificationManagerService extends SystemService { 
        String overrideDefaultAssistantString = DeviceConfig.getProperty(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE);

        if (overrideDefaultAssistantString != null) {

            ComponentName overrideDefaultAssistant =

                    ComponentName.unflattenFromString(overrideDefaultAssistantString);

            if (allowAssistant(userId, overrideDefaultAssistant)) return;

        }



        ArraySet<ComponentName> defaults = mAssistants.getDefaultComponents();

        // We should have only one default assistant by default

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

+0 −38
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import static junit.framework.Assert.assertNull; 
import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.fail;



import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.anyString;
@@ -753,43 +752,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        assertEquals(IMPORTANCE_HIGH, createdChannel.getImportance());

    }



    @Test

    public void testDefaultAssistant_overrideDefault() {

        final int userId = 0;

        final String testComponent = "package/class";

        final List<UserInfo> userInfos = new ArrayList<>();

        userInfos.add(new UserInfo(0, "", 0));

        final ArraySet<ComponentName> validAssistants = new ArraySet<>();

        validAssistants.add(ComponentName.unflattenFromString(testComponent));

        final String originalComponent = DeviceConfig.getProperty(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE

        );

        DeviceConfig.setProperty(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE,

                testComponent,

                false

        );

        when(mActivityManager.isLowRamDevice()).thenReturn(false);

        when(mAssistants.queryPackageForServices(isNull(), anyInt(), anyInt()))

                .thenReturn(validAssistants);

        when(mAssistants.getDefaultComponents()).thenReturn(new ArraySet<>());

        when(mUm.getEnabledProfiles(anyInt())).thenReturn(userInfos);



        mService.setDefaultAssistantForUser(userId);



        verify(mAssistants).setPackageOrComponentEnabled(

                eq(testComponent), eq(userId), eq(true), eq(true));



        DeviceConfig.setProperty(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE,

                originalComponent,

                false

        );

    }



    @Test

    public void testCreateNotificationChannels_IdenticalChannelsInListIgnoresSecond()

            throws Exception {