diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-06-03 16:30:13 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-06-03 16:30:13 +0300 |
| commit | a1cdd291f467c0cf0ea6668c42dd8501b164efb1 (patch) | |
| tree | b7f7a16e8404ee3951d621d0fe6434e2cced6885 | |
| parent | 38a8b2dceacf01095b9ba6604e9705c943795ede (diff) | |
| download | android_packages_apps_Camera2-a1cdd291f467c0cf0ea6668c42dd8501b164efb1.tar.gz android_packages_apps_Camera2-a1cdd291f467c0cf0ea6668c42dd8501b164efb1.tar.bz2 android_packages_apps_Camera2-a1cdd291f467c0cf0ea6668c42dd8501b164efb1.zip | |
Fix storage location NPE
* Check if the preference is already removed
Change-Id: Ib64a4b76d1a4879e1cfa3a23937cd0d4104890f2
| -rw-r--r-- | src/com/android/camera/settings/CameraSettingsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java index 9380fcdc8..e59f6d874 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -157,7 +157,7 @@ public class CameraSettingsActivity extends FragmentActivity { // Fill Storage preference final Preference storagePreference = findPreference(Keys.KEY_STORAGE); - if (mStorageVolumes == null) { + if (mStorageVolumes == null && storagePreference != null) { getPreferenceScreen().removePreference(storagePreference); } else { setEntries(storagePreference); |