Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-28 18:34:05 +00:00
committed by Android (Google) Code Review
parent 2810896630 9f29614ea5
commit fb10308d1d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -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();
}
} }
/** /**

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

@@ -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();
}
} }