commit 2fc4970c2631ec5593c4566a72d4524014b49a29
author Alan Newberger <alann@google.com> Fri Jul 10 16:48:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 10 16:48:42 2015 +0000
tree 7bda65576b7abe2a1c1f86c1c535499f285001e4
parent 148d0b8e3fd412fa6a666e75484fe6b7e0465f5a
parent 00720781f6703de532ddbc05238db5bf5fd7cd2d

am 00720781: Null check when evaluating valid resolution size

* commit '00720781f6703de532ddbc05238db5bf5fd7cd2d':
  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) {