diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-04-03 17:14:45 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2015-04-04 14:40:46 -0700 |
| commit | 1b8ef7e3165ff9aa52a4905dafc8d0f83e7403f9 (patch) | |
| tree | 239df4bffb0d4bdc828174ffe2ac04aab9d3c22e /packages/SettingsProvider | |
| parent | 9e0f8deae851ec917613256dfbe899ae5c1b1ca5 (diff) | |
| download | frameworks_base-1b8ef7e3165ff9aa52a4905dafc8d0f83e7403f9.zip frameworks_base-1b8ef7e3165ff9aa52a4905dafc8d0f83e7403f9.tar.gz frameworks_base-1b8ef7e3165ff9aa52a4905dafc8d0f83e7403f9.tar.bz2 | |
Parcelable objects for Disk/Volume.
Will eventually be used by SystemUI and/or Settings.
Also fix SettingsProvider NPE.
Bug: 19993667, 19909433
Change-Id: Ie326849ac5f43ee35f728d9cc0e332b72292db70
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 126b4aa..0d61606 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1502,15 +1502,15 @@ public class SettingsProvider extends ContentProvider { public void onPackageRemovedLocked(String packageName, int userId) { final int globalKey = makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_OWNER); SettingsState globalSettings = mSettingsStates.get(globalKey); - globalSettings.onPackageRemovedLocked(packageName); + if (globalSettings != null) globalSettings.onPackageRemovedLocked(packageName); final int secureKey = makeKey(SETTINGS_TYPE_SECURE, userId); SettingsState secureSettings = mSettingsStates.get(secureKey); - secureSettings.onPackageRemovedLocked(packageName); + if (secureSettings != null) secureSettings.onPackageRemovedLocked(packageName); final int systemKey = makeKey(SETTINGS_TYPE_SYSTEM, userId); SettingsState systemSettings = mSettingsStates.get(systemKey); - systemSettings.onPackageRemovedLocked(packageName); + if (systemSettings != null) systemSettings.onPackageRemovedLocked(packageName); } private SettingsState peekSettingsStateLocked(int key) { |