diff options
| author | Alan Newberger <alann@google.com> | 2015-07-10 09:39:13 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2015-07-10 09:39:13 -0700 |
| commit | 00720781f6703de532ddbc05238db5bf5fd7cd2d (patch) | |
| tree | 7323393e870c5bdf797e53ba89f1c91a3754821a /src | |
| parent | fd6f316adc5abfa071534642688bdf46f47a3925 (diff) | |
| download | android_packages_apps_Camera2-00720781f6703de532ddbc05238db5bf5fd7cd2d.tar.gz android_packages_apps_Camera2-00720781f6703de532ddbc05238db5bf5fd7cd2d.tar.bz2 android_packages_apps_Camera2-00720781f6703de532ddbc05238db5bf5fd7cd2d.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/settings/ResolutionSetting.java | 2 |
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) { |