summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-04-11 20:19:35 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-04-11 20:19:35 -0700
commitd4a798a4a4accc5f19b4ce6bd5442377548bd13b (patch)
treed2bd92c4b610af13d2fc98c2608a82da738588da /src
parent174f8c4b49dbdf257ed8ae6c54865a7607e6eb80 (diff)
parentfcf8635da88f8ae82a72db210e8b0dc1b2d3c69f (diff)
downloadandroid_packages_apps_Snap-d4a798a4a4accc5f19b4ce6bd5442377548bd13b.tar.gz
android_packages_apps_Snap-d4a798a4a4accc5f19b4ce6bd5442377548bd13b.tar.bz2
android_packages_apps_Snap-d4a798a4a4accc5f19b4ce6bd5442377548bd13b.zip
Merge "Camera: Fix scene disable during zsl/non-zsl switch"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e1cd668cb..9f95154c7 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1370,7 +1370,7 @@ public class PhotoModule
}
private void updateCameraSettings() {
- String sceneMode = mSceneMode;
+ String sceneMode = null;
String flashMode = null;
String redeyeReduction = null;
String aeBracketing = null;