commit 981eb996de64e9e798fa76c59e50d52e6dc1aa8f
author Alan Newberger <alann@google.com> Fri Jul 10 17:06:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 10 17:06:43 2015 +0000
tree 0e0e88ecca84c24cf50f69e759177b6f3b7f5043
parent c28abdb81256db38f8a6ee4780d7e3d091d65991
parent ade8896d12cb0c250c24e38e81848f5fb9032310

am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit 'ade8896d12cb0c250c24e38e81848f5fb9032310':
  Null check when evaluating valid resolution size

src/com/android/camera/settings/ResolutionSetting.java

diff --git a/src/com/android/camera/settings/ResolutionSetting.java b/src/com/android/camera/settings/ResolutionSetting.java
index 5b8f1d9..50ee90c 100644
--- a/src/com/android/camera/settings/ResolutionSetting.java
+++ b/src/com/android/camera/settings/ResolutionSetting.java
@@ -139,7 +139,7 @@
         // 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) {