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

Commit fcd79b48 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Make sure to update config when setBubblesAllowed is called for apps" into qt-dev 

am: fb10308d

Change-Id: Ia29f9843e029ef0640a0b7edc5b2f3c671466cb6
parents 38f5c857 fb10308d

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -481,11 +481,16 @@ public class PreferencesHelper implements RankingConfig { 
     * @param allowed whether bubbles are allowed.

     * @param allowed whether bubbles are allowed.

     */

     */

    public void setBubblesAllowed(String pkg, int uid, boolean allowed) {

    public void setBubblesAllowed(String pkg, int uid, boolean allowed) {

        boolean changed = false;

        synchronized (mPackagePreferences) {

        synchronized (mPackagePreferences) {

            PackagePreferences p = getOrCreatePackagePreferencesLocked(pkg, uid);

            PackagePreferences p = getOrCreatePackagePreferencesLocked(pkg, uid);

            changed = p.allowBubble != allowed;

            p.allowBubble = allowed;

            p.allowBubble = allowed;

            p.lockedAppFields = p.lockedAppFields | LockableAppFields.USER_LOCKED_BUBBLE;

            p.lockedAppFields = p.lockedAppFields | LockableAppFields.USER_LOCKED_BUBBLE;

        }

        }

        if (changed) {

            updateConfig();

        }

    }

    }





    /**

    /**

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -2676,4 +2676,11 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
        assertTrue(mHelper.getNotificationChannel(PKG_O, UID_O, channel1.getId(), false)

        assertTrue(mHelper.getNotificationChannel(PKG_O, UID_O, channel1.getId(), false)

                .isImportanceLockedByCriticalDeviceFunction());

                .isImportanceLockedByCriticalDeviceFunction());

    }

    }



    @Test

    public void testSetBubblesAllowed_false() {

        mHelper.setBubblesAllowed(PKG_O, UID_O, false);

        assertFalse(mHelper.areBubblesAllowed(PKG_O, UID_O));

        verify(mHandler, times(1)).requestSort();

    }

}
 
}