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

Commit fb7e019e authored by Yuri Lin's avatar Yuri Lin Committed by Automerger Merge Worker
Browse files

Merge "Use rule package name in addAutomaticZenRule; specify "android" for all... 

Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb66

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20532079



Change-Id: I1caa71c7cebf92403b53fae2d0dc71ae79cdb3fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f5a4111 e0ddfb66

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

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

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



            return mZenModeHelper.addAutomaticZenRule(pkg, automaticZenRule,

            // If the calling app is the system (from any user), take the package name from the

            // rule's owner rather than from the caller's package.

            String rulePkg = pkg;

            if (isCallingAppIdSystem()) {

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

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

                }

            }



            return mZenModeHelper.addAutomaticZenRule(rulePkg, automaticZenRule,

                    "addAutomaticZenRule");

        }
@@ -7383,6 +7392,12 @@ public class NotificationManagerService extends SystemService { 
        return uid == Process.SYSTEM_UID;

    }



    protected boolean isCallingAppIdSystem() {

        final int uid = Binder.getCallingUid();

        final int appid = UserHandle.getAppId(uid);

        return appid == Process.SYSTEM_UID;

    }



    protected boolean isUidSystemOrPhone(int uid) {

        final int appid = UserHandle.getAppId(uid);

        return (appid == Process.SYSTEM_UID || appid == Process.PHONE_UID || uid == 0);

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

+1 −6
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public class ZenModeHelper { 


    public String addAutomaticZenRule(String pkg, AutomaticZenRule automaticZenRule,

            String reason) {

        if (!isSystemRule(automaticZenRule)) {

        if (!ZenModeConfig.SYSTEM_AUTHORITY.equals(pkg)) {

            PackageItemInfo component = getServiceInfo(automaticZenRule.getOwner());

            if (component == null) {

                component = getActivityInfo(automaticZenRule.getConfigurationActivity());
@@ -532,11 +532,6 @@ public class ZenModeHelper { 
        }

    }



    private boolean isSystemRule(AutomaticZenRule rule) {

        return rule.getOwner() != null

                && ZenModeConfig.SYSTEM_AUTHORITY.equals(rule.getOwner().getPackageName());

    }



    private ServiceInfo getServiceInfo(ComponentName owner) {

        Intent queryIntent = new Intent();

        queryIntent.setComponent(owner);

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

+66 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    private static class TestableNotificationManagerService extends NotificationManagerService {

        int countSystemChecks = 0;

        boolean isSystemUid = true;

        boolean isSystemAppId = true;

        int countLogSmartSuggestionsVisible = 0;

        @Nullable

        NotificationAssistantAccessGrantedCallback mNotificationAssistantAccessGrantedCallback;
@@ -265,6 +266,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
            return isSystemUid;

        }



        @Override

        protected boolean isCallingAppIdSystem() {

            countSystemChecks++;

            return isSystemUid || isSystemAppId;

        }



        @Override

        protected boolean isCallerSystemOrPhone() {

            countSystemChecks++;
@@ -5120,6 +5127,65 @@ 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_systemAppIdCallTakesPackageFromOwner() throws Exception {

        // The multi-user case: where the calling uid doesn't match the system uid, but the calling

        // *appid* is the system.

        mService.isSystemUid = false;

        mService.isSystemAppId = 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;

        mService.isSystemAppId = 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 {

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

+30 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,36 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        }

    }



    @Test

    public void testAddAutomaticZenRule_claimedSystemOwner() {

        // Make sure anything that claims to have a "system" owner but not actually part of the

        // system package still gets limited on number of rules

        for (int i = 0; i < RULE_LIMIT_PER_PACKAGE; i++) {

            ScheduleInfo si = new ScheduleInfo();

            si.startHour = i;

            AutomaticZenRule zenRule = new AutomaticZenRule("name" + i,

                    new ComponentName("android", "ScheduleConditionProvider" + i),

                    null, // configuration activity

                    ZenModeConfig.toScheduleConditionId(si),

                    new ZenPolicy.Builder().build(),

                    NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);

            String id = mZenModeHelperSpy.addAutomaticZenRule("pkgname", zenRule, "test");

            assertNotNull(id);

        }

        try {

            AutomaticZenRule zenRule = new AutomaticZenRule("name",

                    new ComponentName("android", "ScheduleConditionProviderFinal"),

                    null, // configuration activity

                    ZenModeConfig.toScheduleConditionId(new ScheduleInfo()),

                    new ZenPolicy.Builder().build(),

                    NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);

            String id = mZenModeHelperSpy.addAutomaticZenRule("pkgname", zenRule, "test");

            fail("allowed too many rules to be created");

        } catch (IllegalArgumentException e) {

            // yay

        }

    }



    private void setupZenConfig() {

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowAlarms = false;