Merge "Send broadcast to the correct user in QS restore" into main
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index 9e9350b..2e9075c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -186,9 +186,14 @@
sendBroadcast = sBroadcastOnRestore.contains(name);
sendBroadcastSystemUI = sBroadcastOnRestoreSystemUI.contains(name);
- if (sendBroadcast || sendBroadcastSystemUI) {
+ if (sendBroadcast) {
// TODO: http://b/22388012
oldValue = table.lookup(cr, name, UserHandle.USER_SYSTEM);
+ } else if (sendBroadcastSystemUI) {
+ // This is only done for broadcasts sent to system ui as the consumers are known.
+ // It would probably be correct to do it for the ones sent to the system, but consumers
+ // may be depending on the current behavior.
+ oldValue = table.lookup(cr, name, context.getUserId());
}
try {
@@ -266,7 +271,7 @@
if (sendBroadcastSystemUI) {
intent.setPackage(
context.getString(com.android.internal.R.string.config_systemUi));
- context.sendBroadcastAsUser(intent, UserHandle.SYSTEM, null);
+ context.sendBroadcastAsUser(intent, context.getUser(), null);
}
}
}