summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-07-10 17:15:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-10 17:15:34 +0000
commitb92d395a9a3ac5a9b88b872f0f9621ba8e83cf40 (patch)
tree0e0e88ecca84c24cf50f69e759177b6f3b7f5043
parentb7142d73e83a27aba7f874c2f79c2b66d221c8a0 (diff)
parent981eb996de64e9e798fa76c59e50d52e6dc1aa8f (diff)
downloadandroid_packages_apps_Camera2-b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40.tar.gz
android_packages_apps_Camera2-b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40.tar.bz2
android_packages_apps_Camera2-b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40.zip
am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size
* commit '981eb996de64e9e798fa76c59e50d52e6dc1aa8f': Null check when evaluating valid resolution size
-rw-r--r--src/com/android/camera/settings/ResolutionSetting.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/settings/ResolutionSetting.java b/src/com/android/camera/settings/ResolutionSetting.java
index 5b8f1d940..50ee90c9a 100644
--- a/src/com/android/camera/settings/ResolutionSetting.java
+++ b/src/com/android/camera/settings/ResolutionSetting.java
@@ -139,7 +139,7 @@ public class ResolutionSetting {
// fallback, instead of the saved value. This logic should now save a
// valid picture size to the settings and self-correct the state of the
// settings.
- final boolean isPictureSizeFromSettingsValid =
+ final boolean isPictureSizeFromSettingsValid = pictureSize != null &&
pictureSize.width() > 0 && pictureSize.height() > 0;
if (!isPictureSizeSettingSet || isPictureSizeBlacklisted || !isPictureSizeFromSettingsValid) {