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

Commit 9d22bb50 authored by mpodolian's avatar mpodolian
Browse files

Fixed issue with bubble prefs not restored. 

The issue existed when PackagePreferences existed, so written values were ignored.

Test: com.android.server.notification.PreferencesHelperTest#testReadXml_existingPackage_bubblePrefsRestored
Bug: 317931451
Change-Id: If3404480cd04913130a15f07ce9dd068f0d59e9e
parent f1d1fd82

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

+2 −1
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ public class PreferencesHelper implements RankingConfig { 
                    parser.getAttributeInt(null, ATT_VISIBILITY, DEFAULT_VISIBILITY),

                    parser.getAttributeBoolean(null, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE),

                    bubblePref);

            r.bubblePreference = bubblePref;

            r.priority = parser.getAttributeInt(null, ATT_PRIORITY, DEFAULT_PRIORITY);

            r.visibility = parser.getAttributeInt(null, ATT_VISIBILITY, DEFAULT_VISIBILITY);

            r.showBadge = parser.getAttributeBoolean(null, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE);
@@ -676,7 +677,7 @@ public class PreferencesHelper implements RankingConfig { 
     * @param bubblePreference whether bubbles are allowed.

     */

    public void setBubblesAllowed(String pkg, int uid, int bubblePreference) {

        boolean changed = false;

        boolean changed;

        synchronized (mPackagePreferences) {

            PackagePreferences p = getOrCreatePackagePreferencesLocked(pkg, uid);

            changed = p.bubblePreference != bubblePreference;

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

+14 −0
Original line number Diff line number Diff line
@@ -3961,6 +3961,20 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
                mXmlHelper.getAppLockedFields(PKG_O, UID_O));

    }



    @Test

    public void testReadXml_existingPackage_bubblePrefsRestored() throws Exception {

        mHelper.setBubblesAllowed(PKG_O, UID_O, BUBBLE_PREFERENCE_ALL);

        assertEquals(BUBBLE_PREFERENCE_ALL, mHelper.getBubblePreference(PKG_O, UID_O));



        mXmlHelper.setBubblesAllowed(PKG_O, UID_O, BUBBLE_PREFERENCE_NONE);

        assertEquals(BUBBLE_PREFERENCE_NONE, mXmlHelper.getBubblePreference(PKG_O, UID_O));



        ByteArrayOutputStream stream = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL);

        loadStreamXml(stream, true, UserHandle.USER_ALL);



        assertEquals(BUBBLE_PREFERENCE_ALL, mXmlHelper.getBubblePreference(PKG_O, UID_O));

    }



    @Test

    public void testUpdateNotificationChannel_fixedPermission() {

        List<UserInfo> users = ImmutableList.of(new UserInfo(UserHandle.USER_SYSTEM, "user0", 0));