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

Commit 57a974ba authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Handle empty default lists in confg.xml 

Test: NotificationManagerServiceTest
Fixes: 142157313
Change-Id: Ied9c4c014227985eb460c6f984d30ca1e934a6ad
parent 52f2786a

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ abstract public class ManagedServices { 
    }



    protected void addDefaultComponentOrPackage(String packageOrComponent) {

        if (packageOrComponent != null) {

        if (!TextUtils.isEmpty(packageOrComponent)) {

            synchronized (mDefaultsLock) {

                ComponentName cn = ComponentName.unflattenFromString(packageOrComponent);

                if (cn == null) {

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

+9 −2
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ public class NotificationManagerService extends SystemService { 


    }





    void loadDefaultApprovedServices(int userId) {

        String defaultListenerAccess = getContext().getResources().getString(

                com.android.internal.R.string.config_defaultListenerAccessPackages);
@@ -530,6 +529,9 @@ public class NotificationManagerService extends SystemService { 
            String[] listeners =

                    defaultListenerAccess.split(ManagedServices.ENABLED_SERVICES_SEPARATOR);

            for (int i = 0; i < listeners.length; i++) {

                if (TextUtils.isEmpty(listeners[i])) {

                    continue;

                }

                ArraySet<ComponentName> approvedListeners =

                        mListeners.queryPackageForServices(listeners[i],

                                MATCH_DIRECT_BOOT_AWARE
@@ -546,6 +548,9 @@ public class NotificationManagerService extends SystemService { 
        if (defaultDndAccess != null) {

            String[] dnds = defaultDndAccess.split(ManagedServices.ENABLED_SERVICES_SEPARATOR);

            for (int i = 0; i < dnds.length; i++) {

                if (TextUtils.isEmpty(dnds[i])) {

                    continue;

                }

                mConditionProviders.addDefaultComponentOrPackage(dnds[i]);

            }

        }
@@ -564,12 +569,14 @@ public class NotificationManagerService extends SystemService { 
                .split(ManagedServices.ENABLED_SERVICES_SEPARATOR)));

        for (int i = 0; i < assistants.size(); i++) {

            String cnString = assistants.valueAt(i);

            if (TextUtils.isEmpty(cnString)) {

                continue;

            }

            mAssistants.addDefaultComponentOrPackage(cnString);

        }

    }



    protected void allowDefaultApprovedServices(int userId) {



        ArraySet<ComponentName> defaultListeners = mListeners.getDefaultComponents();

        for (int i = 0; i < defaultListeners.size(); i++) {

            ComponentName cn = defaultListeners.valueAt(i);

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

+37 −6
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import static android.content.pm.PackageManager.PERMISSION_DENIED; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.Build.VERSION_CODES.O_MR1;

import static android.os.Build.VERSION_CODES.P;

import static android.os.UserHandle.USER_SYSTEM;

import static android.service.notification.Adjustment.KEY_IMPORTANCE;

import static android.service.notification.Adjustment.KEY_USER_SENTIMENT;

import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE;
@@ -129,6 +130,7 @@ import android.testing.TestableContext; 
import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;

import android.testing.TestablePermissions;

import android.testing.TestableResources;

import android.text.Html;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -3278,7 +3280,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    @Test

    public void testRestore() throws Exception {

        int systemChecks = mService.countSystemChecks;

        mBinderService.applyRestore(null, UserHandle.USER_SYSTEM);

        mBinderService.applyRestore(null, USER_SYSTEM);

        assertEquals(1, mService.countSystemChecks - systemChecks);

    }
@@ -3347,7 +3349,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        reset(mUgmInternal);

        when(mUgmInternal.newUriPermissionOwner(any())).thenReturn(new Binder());

        mService.updateUriPermissions(recordA, null, mContext.getPackageName(),

                UserHandle.USER_SYSTEM);

                USER_SYSTEM);

        verify(mUgm, times(1)).grantUriPermissionFromOwner(any(), anyInt(), any(),

                eq(message1.getDataUri()), anyInt(), anyInt(), anyInt());

        verify(mUgm, times(1)).grantUriPermissionFromOwner(any(), anyInt(), any(),
@@ -3363,21 +3365,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        // Update means we drop access to first

        reset(mUgmInternal);

        mService.updateUriPermissions(recordB, recordA, mContext.getPackageName(),

                UserHandle.USER_SYSTEM);

                USER_SYSTEM);

        verify(mUgmInternal, times(1)).revokeUriPermissionFromOwner(any(),

                eq(message1.getDataUri()), anyInt(), anyInt());



        // Update back means we grant access to first again

        reset(mUgm);

        mService.updateUriPermissions(recordA, recordB, mContext.getPackageName(),

                UserHandle.USER_SYSTEM);

                USER_SYSTEM);

        verify(mUgm, times(1)).grantUriPermissionFromOwner(any(), anyInt(), any(),

                eq(message1.getDataUri()), anyInt(), anyInt(), anyInt());



        // And update to empty means we drop everything

        reset(mUgmInternal);

        mService.updateUriPermissions(null, recordB, mContext.getPackageName(),

                UserHandle.USER_SYSTEM);

                USER_SYSTEM);

        verify(mUgmInternal, times(1)).revokeUriPermissionFromOwner(any(), eq(null),

                anyInt(), anyInt());

    }
@@ -4077,7 +4079,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    public void testIsCallerInstantApp_userAllNotification() throws Exception {

        ApplicationInfo info = new ApplicationInfo();

        info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;

        when(mPackageManager.getApplicationInfo(anyString(), anyInt(), eq(UserHandle.USER_SYSTEM)))

        when(mPackageManager.getApplicationInfo(anyString(), anyInt(), eq(USER_SYSTEM)))

                .thenReturn(info);

        when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(new String[]{"any"});
@@ -5666,4 +5668,33 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG);

        assertEquals(1, notifsAfter.length);

    }



    @Test

    public void testLoadDefaultApprovedServices_emptyResources() {

        TestableResources tr = mContext.getOrCreateTestableResources();

        tr.addOverride(com.android.internal.R.string.config_defaultListenerAccessPackages, "");

        tr.addOverride(com.android.internal.R.string.config_defaultDndAccessPackages, "");

        tr.addOverride(com.android.internal.R.string.config_defaultAssistantAccessComponent, "");

        setDefaultAssistantInDeviceConfig("");



        mService.loadDefaultApprovedServices(USER_SYSTEM);



        verify(mListeners, never()).addDefaultComponentOrPackage(anyString());

        verify(mConditionProviders, never()).addDefaultComponentOrPackage(anyString());

        verify(mAssistants, never()).addDefaultComponentOrPackage(anyString());

    }



    @Test

    public void testLoadDefaultApprovedServices_dnd() {

        TestableResources tr = mContext.getOrCreateTestableResources();

        tr.addOverride(com.android.internal.R.string.config_defaultDndAccessPackages, "test");

        when(mListeners.queryPackageForServices(anyString(), anyInt(), anyInt()))

                .thenReturn(new ArraySet<>());



        mService.loadDefaultApprovedServices(USER_SYSTEM);



        verify(mConditionProviders, times(1)).addDefaultComponentOrPackage("test");

    }



    // TODO: add tests for the rest of the non-empty cases

}