diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-04 16:04:28 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-04 16:04:28 -0800 |
| commit | 69736e148411a6b5121b5705320b7ebccec5b4dc (patch) | |
| tree | 186a4324f24b66a08d373fdf85951b2b3a85eaef /src/com/android/camera/PhotoModule.java | |
| parent | 9a4bd93169204977eb48dbd478e5ba7cbc5f121f (diff) | |
| parent | abb8aa280b72c90b966f8f06480b2dfb76f9cd8b (diff) | |
| download | android_packages_apps_Snap-69736e148411a6b5121b5705320b7ebccec5b4dc.tar.gz android_packages_apps_Snap-69736e148411a6b5121b5705320b7ebccec5b4dc.tar.bz2 android_packages_apps_Snap-69736e148411a6b5121b5705320b7ebccec5b4dc.zip | |
Merge "Camera2: Check mCameradevice before setting skinToneEnhancement"
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a3ee3b360..ddac046ad 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -442,7 +442,7 @@ public class PhotoModule } case CONFIGURE_SKIN_TONE_FACTOR: { - if (isCameraIdle()) { + if ((mCameraDevice != null) && isCameraIdle()) { mParameters = mCameraDevice.getParameters(); mParameters.set("skinToneEnhancement", String.valueOf(msg.arg1)); mCameraDevice.setParameters(mParameters); |