diff options
author | Konsta <konsta09@gmail.com> | 2014-12-08 16:22:55 +0200 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 17:17:51 +0200 |
commit | 462eaf3056bfd06361c290a83049361e733cabb0 (patch) | |
tree | 8f05200d03e7eddf247dff5126f8f27b554a8e0d | |
parent | af65ec3306f3006d12429e0cbcdc735a7bbec013 (diff) | |
download | android_packages_apps_Camera2-462eaf3056bfd06361c290a83049361e733cabb0.tar.gz android_packages_apps_Camera2-462eaf3056bfd06361c290a83049361e733cabb0.tar.bz2 android_packages_apps_Camera2-462eaf3056bfd06361c290a83049361e733cabb0.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 50641fd22..32afbed49 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -147,6 +147,7 @@ public class CameraSettingsActivity extends FragmentActivity { private String mPrefKey; private boolean mHideAdvancedScreen; private boolean mGetSubPrefAsRoot = true; + private boolean mPreferencesRemoved = false; // Selected resolutions for the different cameras and sizes. private PictureSizes mPictureSizes; @@ -285,18 +286,19 @@ public class CameraSettingsActivity extends FragmentActivity { private void setVisibilities() { PreferenceGroup resolutions = (PreferenceGroup) findPreference(PREF_CATEGORY_RESOLUTION); - if (mPictureSizes.backCameraSizes.isEmpty()) { + if ((mPictureSizes.backCameraSizes.isEmpty()) && !mPreferencesRemoved) { recursiveDelete(resolutions, findPreference(Keys.KEY_PICTURE_SIZE_BACK)); recursiveDelete(resolutions, findPreference(Keys.KEY_VIDEO_QUALITY_BACK)); } - if (mPictureSizes.frontCameraSizes.isEmpty()) { + if ((mPictureSizes.frontCameraSizes.isEmpty()) && !mPreferencesRemoved) { recursiveDelete(resolutions, findPreference(Keys.KEY_PICTURE_SIZE_FRONT)); recursiveDelete(resolutions, findPreference(Keys.KEY_VIDEO_QUALITY_FRONT)); } + mPreferencesRemoved = true; } /** |