diff options
| author | Konsta <konsta09@gmail.com> | 2014-12-08 16:22:55 +0200 |
|---|---|---|
| committer | Konsta <konsta09@gmail.com> | 2014-12-08 17:05:43 +0200 |
| commit | 560c67725b4a348b02031066e5a2f4a8ac4335b2 (patch) | |
| tree | 24bea48749c4bc07ac15811a7bbcac1e846736cd | |
| parent | 2f52c5bcde5781da23505c28b2600b332fb3b0f6 (diff) | |
| download | android_packages_apps_Camera2-560c67725b4a348b02031066e5a2f4a8ac4335b2.tar.gz android_packages_apps_Camera2-560c67725b4a348b02031066e5a2f4a8ac4335b2.tar.bz2 android_packages_apps_Camera2-560c67725b4a348b02031066e5a2f4a8ac4335b2.zip | |
Camera2: Remove settings preferences only once
Browsing through camera settings crashes on devices with only
a back- or a front facing camera. Fix NPE on removing preferences
that are already removed.
Change-Id: I00b4549e18ea44975bf795da9384892d8ef2ee16
| -rw-r--r-- | src/com/android/camera/settings/CameraSettingsActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java index f09f33b20..25c9c7129 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -87,6 +87,7 @@ public class CameraSettingsActivity extends FragmentActivity { private CameraDeviceInfo mInfos; private final String mPrefKey; private boolean mGetSubPrefAsRoot = true; + private boolean mPreferencesRemoved = false; // Selected resolutions for the different cameras and sizes. private SelectedPictureSizes mOldPictureSizesBack; @@ -209,18 +210,19 @@ public class CameraSettingsActivity extends FragmentActivity { private void setVisibilities() { PreferenceGroup resolutions = (PreferenceGroup) findPreference(PREF_CATEGORY_RESOLUTION); - if (mPictureSizesBack == null) { + if ((mPictureSizesBack == null) && !mPreferencesRemoved) { recursiveDelete(resolutions, findPreference(Keys.KEY_PICTURE_SIZE_BACK)); recursiveDelete(resolutions, findPreference(Keys.KEY_VIDEO_QUALITY_BACK)); } - if (mPictureSizesFront == null) { + if ((mPictureSizesFront == null) && !mPreferencesRemoved) { recursiveDelete(resolutions, findPreference(Keys.KEY_PICTURE_SIZE_FRONT)); recursiveDelete(resolutions, findPreference(Keys.KEY_VIDEO_QUALITY_FRONT)); } + mPreferencesRemoved = true; } /** |