diff options
| author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2013-10-11 18:15:43 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:40:09 -0600 |
| commit | a051ea5f2d2568144ba1c491153877d55076343d (patch) | |
| tree | 51a06a03c599b2664fbee4a30b05fa448dabffe7 /src/com/android/camera/PhotoMenu.java | |
| parent | 58eba7849f95dd1315b511166a325768980e31fe (diff) | |
| download | android_packages_apps_Snap-a051ea5f2d2568144ba1c491153877d55076343d.tar.gz android_packages_apps_Snap-a051ea5f2d2568144ba1c491153877d55076343d.tar.bz2 android_packages_apps_Snap-a051ea5f2d2568144ba1c491153877d55076343d.zip | |
Camera : Fix null preference string for scene mode and fd.
Null pointer exception in app is observed when the preference
string for scene mode is dereferenced.for YUV Sensor, preference
setting for scene mode is NULL as its not applicable for YUV sensor.
Change-Id: Icc04e9b21641b1cc3ca7e183a23667be151b5a65
(cherry picked from commit 56dd2afdd7ad89e85d06450175538dbd3f075e8c)
(cherry picked from commit 040389fdf54389745b19a61f40732f54a8ce7344)
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 5ebd58098..5e230f451 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -256,10 +256,10 @@ public class PhotoMenu extends PieController ListPreference pref = mPreferenceGroup.findPreference( CameraSettings.KEY_SCENE_MODE); - String sceneMode = pref.getValue(); + String sceneMode = (pref != null) ? pref.getValue() : null; pref = mPreferenceGroup.findPreference(CameraSettings.KEY_FACE_DETECTION); - String faceDetection = pref.getValue(); - if (!Parameters.SCENE_MODE_AUTO.equals(sceneMode)){ + String faceDetection = (pref != null) ? pref.getValue() : null; + if ((sceneMode != null) && !Parameters.SCENE_MODE_AUTO.equals(sceneMode)){ popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); popup2.setPreferenceEnabled(CameraSettings.KEY_AUTOEXPOSURE,false); popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false); @@ -267,7 +267,7 @@ public class PhotoMenu extends PieController popup3.setPreferenceEnabled(CameraSettings.KEY_WHITE_BALANCE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE,false); } - if (!Parameters.FACE_DETECTION_ON.equals(faceDetection)){ + if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)){ popup2.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION,false); } } |