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

Commit 2c181fda authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

Merge "catch USER_ALL in badging check" into oc-dev 

am: 3a01c856

Change-Id: Icf5dc0fd6fd5d2686de01b3f053c211ffb8abb25
parents 95da3ca1 3a01c856

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

+3 −0
Original line number Diff line number Diff line
@@ -1158,6 +1158,9 @@ public class RankingHelper implements RankingConfig { 


    public boolean badgingEnabled(UserHandle userHandle) {

        int userId = userHandle.getIdentifier();

        if (userId == UserHandle.USER_ALL) {

            return false;

        }

        if (mBadgingEnabled.indexOfKey(userId) < 0) {

            mBadgingEnabled.put(userId,

                    Secure.getIntForUser(mContext.getContentResolver(),

services/tests/notification/src/com/android/server/notification/RankingHelperTest.java

+9 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,15 @@ public class RankingHelperTest extends NotificationTestCase { 
        assertFalse(mHelper.badgingEnabled(USER));

    }



    @Test

    public void testBadgingForUserAll() throws Exception {

        try {

            mHelper.badgingEnabled(UserHandle.ALL);

        } catch (Exception e) {

            fail("just don't throw");

        }

    }



    @Test

    public void testBadgingOverrideUserIsolation() throws Exception {

        Secure.putIntForUser(getContext().getContentResolver(),