Merge "Dispatch global settings changes to all users." into pi-dev

am: 4a99e98b48

Change-Id: Icb07bd1eba4b9ff559e5cf66a94382d24d057501

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 7de54db4ffeb..cb5763fa1315 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2774,7 +2774,9 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private void notifyForSettingsChange(int key, String name) {
-            final int userId = getUserIdFromKey(key);
+            final int userId = isGlobalSettingsKey(key)
+                    ? UserHandle.USER_ALL : getUserIdFromKey(key);
+
             Uri uri = getNotificationUriFor(key, name);
 
             mGenerationRegistry.incrementGeneration(key);