diff options
| author | Alan Newberger <alann@google.com> | 2015-07-10 16:55:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 16:55:18 +0000 |
| commit | ade8896d12cb0c250c24e38e81848f5fb9032310 (patch) | |
| tree | 6c0aaca9c81e1db23b7cc546c08635b3b1967147 /src | |
| parent | dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3 (diff) | |
| parent | 2fc4970c2631ec5593c4566a72d4524014b49a29 (diff) | |
| download | android_packages_apps_Camera2-ade8896d12cb0c250c24e38e81848f5fb9032310.tar.gz android_packages_apps_Camera2-ade8896d12cb0c250c24e38e81848f5fb9032310.tar.bz2 android_packages_apps_Camera2-ade8896d12cb0c250c24e38e81848f5fb9032310.zip | |
am 2fc4970c: am 00720781: Null check when evaluating valid resolution size
* commit '2fc4970c2631ec5593c4566a72d4524014b49a29':
Null check when evaluating valid resolution size
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) { |