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

Commit 2ceaaebb authored by Yuri Lin's avatar Yuri Lin
Browse files

Fix system zen rules by using owner package name if caller is system 

Previously were unable to add new zen rules because rules added via the settings pages were getting registered under package "com.android.settings", which then were not considered "system rules". These rules should have package android, so when we can trust the caller (via checking that the caller is system) we should be taking the package name from the owner of the rule.

Bug: 245236706
Bug: 242537431
Test: NMSTest; manual

Change-Id: Id69b671592396ac3304862dadbe73de328a8e27a
Merged-In: Id69b671592396ac3304862dadbe73de328a8e27a
parent 043b90b3

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

+10 −1
Original line number Diff line number Diff line
@@ -4482,7 +4482,16 @@ public class NotificationManagerService extends SystemService { 
            }

            enforcePolicyAccess(Binder.getCallingUid(), "addAutomaticZenRule");



            return mZenModeHelper.addAutomaticZenRule(pkg, automaticZenRule,

            // If the caller is system, take the package name from the rule's owner rather than

            // from the caller's package.

            String rulePkg = pkg;

            if (isCallingUidSystem()) {

                if (automaticZenRule.getOwner() != null) {

                    rulePkg = automaticZenRule.getOwner().getPackageName();

                }

            }



            return mZenModeHelper.addAutomaticZenRule(rulePkg, automaticZenRule,

                    "addAutomaticZenRule");

        }

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

+37 −0
Original line number Diff line number Diff line
@@ -5936,6 +5936,43 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        mBinderService.addAutomaticZenRule(rule, mContext.getPackageName());

    }



    @Test

    public void testAddAutomaticZenRule_systemCallTakesPackageFromOwner() throws Exception {

        mService.isSystemUid = true;

        ZenModeHelper mockZenModeHelper = mock(ZenModeHelper.class);

        when(mConditionProviders.isPackageOrComponentAllowed(anyString(), anyInt()))

                .thenReturn(true);

        mService.setZenHelper(mockZenModeHelper);

        ComponentName owner = new ComponentName("android", "ProviderName");

        ZenPolicy zenPolicy = new ZenPolicy.Builder().allowAlarms(true).build();

        boolean isEnabled = true;

        AutomaticZenRule rule = new AutomaticZenRule("test", owner, owner, mock(Uri.class),

                zenPolicy, NotificationManager.INTERRUPTION_FILTER_PRIORITY, isEnabled);

        mBinderService.addAutomaticZenRule(rule, "com.android.settings");



        // verify that zen mode helper gets passed in a package name of "android"

        verify(mockZenModeHelper).addAutomaticZenRule(eq("android"), eq(rule), anyString());

    }



    @Test

    public void testAddAutomaticZenRule_nonSystemCallTakesPackageFromArg() throws Exception {

        mService.isSystemUid = false;

        ZenModeHelper mockZenModeHelper = mock(ZenModeHelper.class);

        when(mConditionProviders.isPackageOrComponentAllowed(anyString(), anyInt()))

                .thenReturn(true);

        mService.setZenHelper(mockZenModeHelper);

        ComponentName owner = new ComponentName("android", "ProviderName");

        ZenPolicy zenPolicy = new ZenPolicy.Builder().allowAlarms(true).build();

        boolean isEnabled = true;

        AutomaticZenRule rule = new AutomaticZenRule("test", owner, owner, mock(Uri.class),

                zenPolicy, NotificationManager.INTERRUPTION_FILTER_PRIORITY, isEnabled);

        mBinderService.addAutomaticZenRule(rule, "another.package");



        // verify that zen mode helper gets passed in the package name from the arg, not the owner

        verify(mockZenModeHelper).addAutomaticZenRule(

                eq("another.package"), eq(rule), anyString());

    }



    @Test

    public void testAreNotificationsEnabledForPackage_crossUser() throws Exception {

        try {