diff options
| author | Alan Newberger <alann@google.com> | 2015-07-10 17:30:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 17:30:02 +0000 |
| commit | de893a7b6795703ea2f05f609264c4fc7917ce09 (patch) | |
| tree | e822c411da9708b6a82b92935cc7910fcc29a94c | |
| parent | b331ac923532972160582bdd960936b5e9a0c149 (diff) | |
| parent | b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40 (diff) | |
| download | android_packages_apps_Camera2-de893a7b6795703ea2f05f609264c4fc7917ce09.tar.gz android_packages_apps_Camera2-de893a7b6795703ea2f05f609264c4fc7917ce09.tar.bz2 android_packages_apps_Camera2-de893a7b6795703ea2f05f609264c4fc7917ce09.zip | |
am b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size
* commit 'b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40':
Null check when evaluating valid resolution size
| -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) { |