From 83fec0069787263ce1ed2f3f75ccf2eadc67705e Mon Sep 17 00:00:00 2001 From: Phil Weaver Date: Wed, 11 May 2016 10:55:29 -0700 Subject: [PATCH] Fix a race in settings update. Need to invalidate caching before notifying of changes. Bug: 28621277 Change-Id: I2820b15d2364ecaad7666a820c0c7280ac6b7b4c --- .../src/com/android/providers/settings/SettingsProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 5ff9c0ce3c847..596e5a8ccc01a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1948,6 +1948,8 @@ public class SettingsProvider extends ContentProvider { final int userId = getUserIdFromKey(key); Uri uri = getNotificationUriFor(key, name); + mGenerationRegistry.incrementGeneration(key); + mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED, userId, 0, uri).sendToTarget(); @@ -1959,8 +1961,6 @@ public class SettingsProvider extends ContentProvider { sSystemCloneToManagedSettings); } - mGenerationRegistry.incrementGeneration(key); - mHandler.obtainMessage(MyHandler.MSG_NOTIFY_DATA_CHANGED).sendToTarget(); }