diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-03 20:28:59 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-03 20:28:59 -0800 |
commit | 1e158e9ce78c25dc5de402f14654a8955de7fddc (patch) | |
tree | 5ac6b680d2f41a07821a9f2267672fc16e11b23c /services | |
parent | 327e94daff12ab4ac4da61a3ea802f3f225d1b3a (diff) | |
parent | 9aa597e68b3fb30b079d627e1fcdea766e98ad26 (diff) | |
download | frameworks_base-1e158e9ce78c25dc5de402f14654a8955de7fddc.zip frameworks_base-1e158e9ce78c25dc5de402f14654a8955de7fddc.tar.gz frameworks_base-1e158e9ce78c25dc5de402f14654a8955de7fddc.tar.bz2 |
Merge "Propagating core settings to the system process." into honeycomb-mr1
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/am/CoreSettingsObserver.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/CoreSettingsObserver.java b/services/java/com/android/server/am/CoreSettingsObserver.java index 25db84a..585cf2b 100644 --- a/services/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/java/com/android/server/am/CoreSettingsObserver.java @@ -52,7 +52,7 @@ class CoreSettingsObserver extends ContentObserver { super(activityManagerService.mHandler); mActivityManagerService = activityManagerService; beginObserveCoreSettings(); - populateCoreSettings(mCoreSettings); + sendCoreSettings(); } public Bundle getCoreSettingsLocked() { @@ -62,11 +62,15 @@ class CoreSettingsObserver extends ContentObserver { @Override public void onChange(boolean selfChange) { synchronized (mActivityManagerService) { - populateCoreSettings(mCoreSettings); - mActivityManagerService.onCoreSettingsChange(mCoreSettings); + sendCoreSettings(); } } + private void sendCoreSettings() { + populateCoreSettings(mCoreSettings); + mActivityManagerService.onCoreSettingsChange(mCoreSettings); + } + private void beginObserveCoreSettings() { for (String setting : sCoreSettingToTypeMap.keySet()) { Uri uri = Settings.Secure.getUriFor(setting); |