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 
am: fb10308d1d

Change-Id: Ia29f9843e029ef0640a0b7edc5b2f3c671466cb6
This commit is contained in:
Mady Mellor
2019-05-28 11:45:34 -07:00
committed by android-build-merger
parent 38f5c85758 fb10308d1d
commit fcd79b4820
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.
*/
public void setBubblesAllowed(String pkg, int uid, boolean allowed) {
boolean changed = false;
synchronized (mPackagePreferences) {
PackagePreferences p = getOrCreatePackagePreferencesLocked(pkg, uid);
changed = p.allowBubble != allowed;
p.allowBubble = allowed;
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)
.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();
}
}