From 00720781f6703de532ddbc05238db5bf5fd7cd2d Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Fri, 10 Jul 2015 09:39:13 -0700 Subject: Null check when evaluating valid resolution size Guard against nonexistent size so that logic to reset size preference can proceed BUG=22396405 Change-Id: Id508713ef91f632867366934e72fe939a839e228 --- src/com/android/camera/settings/ResolutionSetting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.3