diff options
| author | LuK1337 <priv.luk@gmail.com> | 2016-01-03 13:05:26 +0100 |
|---|---|---|
| committer | LuK1337 <priv.luk@gmail.com> | 2016-01-03 13:07:24 +0100 |
| commit | 3b7e67304b50851d325bc91261e15aa71c6e995a (patch) | |
| tree | 43f690dcd0b81a9d360603c712c7addede83ad32 /src | |
| parent | 553ccb7777f67205681ea27074272e95ed7f5e6c (diff) | |
| download | android_packages_apps_Camera2-3b7e67304b50851d325bc91261e15aa71c6e995a.tar.gz android_packages_apps_Camera2-3b7e67304b50851d325bc91261e15aa71c6e995a.tar.bz2 android_packages_apps_Camera2-3b7e67304b50851d325bc91261e15aa71c6e995a.zip | |
CameraSettingsActivity: Handle NPE when storage preference is already removed
Fixes: http://pastebin.com/zv1sPid2
Change-Id: I05951f93b37759f4d8c9f2fde10c84eb388c4830
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/settings/CameraSettingsActivity.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java index ad085f5c6..4e05add96 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -223,11 +223,13 @@ public class CameraSettingsActivity extends FragmentActivity { // Fill Storage preference final Preference storagePreference = findPreference(Keys.KEY_STORAGE); - if (mStorageVolumes == null) { - getPreferenceScreen().removePreference(storagePreference); - } else { - setEntries(storagePreference); - setSummary(storagePreference); + if (storagePreference != null) { + if (mStorageVolumes == null) { + getPreferenceScreen().removePreference(storagePreference); + } else { + setEntries(storagePreference); + setSummary(storagePreference); + } } getPreferenceScreen().getSharedPreferences() |