diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-08-28 17:09:22 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-08-28 17:09:22 +0800 |
| commit | c37bf0d648ae6678db79b58fe76e5719fb4e0419 (patch) | |
| tree | 0b00a6972b4690c34be9e55bfb6e678fa0b140ce | |
| parent | 66cfac8e6a6ad37ee12bc6d267cb40759a72d673 (diff) | |
| download | Camera-c37bf0d648ae6678db79b58fe76e5719fb4e0419.tar.gz | |
Fix NPE in CameraSettings.
bug:7054776
Change-Id: Iee9370aab6c4f042df6ef79077cdf4985ff402db
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index a2fc8aa8..46351200 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -210,8 +210,8 @@ public class CameraSettings { filterUnsupportedOptions(group, videoEffect, null); } } - if (cameraHdr == null || !ApiHelper.HAS_CAMERA_HDR - || !Util.isCameraHdrSupported(mParameters)) { + if (cameraHdr != null && (!ApiHelper.HAS_CAMERA_HDR + || !Util.isCameraHdrSupported(mParameters))) { removePreference(group, cameraHdr.getKey()); } } |