Secure => global bubble settings pt 1
Follow up to http://ag/8222583
- Remove Secure.NOTIFICATION_BUBBLES from backup.
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
- Update tests
Fixes: 136034310
Bug: 129158983
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: I0c1956272e9d18bcd2e13c6658ca8925cedfcef5
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e64da06..6b4a040 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9015,7 +9015,6 @@
ASSIST_GESTURE_WAKE_ENABLED,
VR_DISPLAY_MODE,
NOTIFICATION_BADGING,
- NOTIFICATION_BUBBLES, // moved to global
NOTIFICATION_DISMISS_RTL,
QS_AUTO_ADDED_TILES,
SCREENSAVER_ENABLED,
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index c681241..6f7c8c5 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1359,7 +1359,7 @@
private final Uri NOTIFICATION_BADGING_URI
= Settings.Secure.getUriFor(Settings.Secure.NOTIFICATION_BADGING);
private final Uri NOTIFICATION_BUBBLES_URI
- = Settings.Secure.getUriFor(Settings.Secure.NOTIFICATION_BUBBLES);
+ = Settings.Secure.getUriFor(Settings.Global.NOTIFICATION_BUBBLES);
private final Uri NOTIFICATION_LIGHT_PULSE_URI
= Settings.System.getUriFor(Settings.System.NOTIFICATION_LIGHT_PULSE);
private final Uri NOTIFICATION_RATE_LIMIT_URI
diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java
index 7b45a1b..28b7e6b 100644
--- a/services/core/java/com/android/server/notification/PreferencesHelper.java
+++ b/services/core/java/com/android/server/notification/PreferencesHelper.java
@@ -1826,9 +1826,9 @@
for (int index = 0; index < mBubblesEnabled.size(); index++) {
int userId = mBubblesEnabled.keyAt(index);
final boolean oldValue = mBubblesEnabled.get(userId);
- final boolean newValue = Settings.Secure.getIntForUser(mContext.getContentResolver(),
- Settings.Secure.NOTIFICATION_BUBBLES,
- DEFAULT_ALLOW_BUBBLE ? 1 : 0, userId) != 0;
+ final boolean newValue = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.NOTIFICATION_BUBBLES,
+ DEFAULT_ALLOW_BUBBLE ? 1 : 0) != 0;
mBubblesEnabled.put(userId, newValue);
changed |= oldValue != newValue;
}
@@ -1844,9 +1844,9 @@
}
if (mBubblesEnabled.indexOfKey(userId) < 0) {
mBubblesEnabled.put(userId,
- Settings.Secure.getIntForUser(mContext.getContentResolver(),
- Settings.Secure.NOTIFICATION_BUBBLES,
- DEFAULT_ALLOW_BUBBLE ? 1 : 0, userId) != 0);
+ Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.NOTIFICATION_BUBBLES,
+ DEFAULT_ALLOW_BUBBLE ? 1 : 0) != 0);
}
return mBubblesEnabled.get(userId, DEFAULT_ALLOW_BUBBLE);
}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
index 8f8b746..fd4295a 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
@@ -58,7 +58,9 @@
import android.os.Build;
import android.os.UserHandle;
import android.provider.Settings;
+import android.provider.Settings.Global;
import android.provider.Settings.Secure;
+
import android.test.suitebuilder.annotation.SmallTest;
import android.testing.TestableContentResolver;
import android.util.ArrayMap;
@@ -152,8 +154,7 @@
contentResolver.setFallbackToExisting(false);
Secure.putIntForUser(contentResolver,
Secure.NOTIFICATION_BADGING, 1, UserHandle.getUserId(UID_N_MR1));
- Secure.putIntForUser(contentResolver,
- Secure.NOTIFICATION_BUBBLES, 1, UserHandle.getUserId(UID_N_MR1));
+ Global.putInt(contentResolver, Global.NOTIFICATION_BUBBLES, 1);
ContentProvider testContentProvider = mock(ContentProvider.class);
when(testContentProvider.getIContentProvider()).thenReturn(mTestIContentProvider);
@@ -1948,18 +1949,16 @@
@Test
public void testBubblesOverrideTrue() {
- Secure.putIntForUser(getContext().getContentResolver(),
- Secure.NOTIFICATION_BUBBLES, 1,
- USER.getIdentifier());
+ Global.putInt(getContext().getContentResolver(),
+ Global.NOTIFICATION_BUBBLES, 1);
mHelper.updateBubblesEnabled(); // would be called by settings observer
assertTrue(mHelper.bubblesEnabled(USER));
}
@Test
public void testBubblesOverrideFalse() {
- Secure.putIntForUser(getContext().getContentResolver(),
- Secure.NOTIFICATION_BUBBLES, 0,
- USER.getIdentifier());
+ Global.putInt(getContext().getContentResolver(),
+ Global.NOTIFICATION_BUBBLES, 0);
mHelper.updateBubblesEnabled(); // would be called by settings observer
assertFalse(mHelper.bubblesEnabled(USER));
}
@@ -1974,19 +1973,6 @@
}
@Test
- public void testBubblesOverrideUserIsolation() {
- Secure.putIntForUser(getContext().getContentResolver(),
- Secure.NOTIFICATION_BUBBLES, 0,
- USER.getIdentifier());
- Secure.putIntForUser(getContext().getContentResolver(),
- Secure.NOTIFICATION_BUBBLES, 1,
- USER2.getIdentifier());
- mHelper.updateBubblesEnabled(); // would be called by settings observer
- assertFalse(mHelper.bubblesEnabled(USER));
- assertTrue(mHelper.bubblesEnabled(USER2));
- }
-
- @Test
public void testOnLocaleChanged_updatesDefaultChannels() throws Exception {
String newLabel = "bananas!";
final NotificationChannel defaultChannel = mHelper.getNotificationChannel(PKG_N_MR1,
