summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-11 19:21:57 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-11 19:21:57 -0800
commit3b828c566e03ecc5c6bc398852dc58546d857678 (patch)
tree7486e240362a8f4d49fe76b2547d6191f3710fc0
parentcc72964c0783793e5475bcfb01c41ecd440c62ae (diff)
parent1501884aa5add207a44bd9ddb57ca5270d367c3b (diff)
downloadandroid_packages_apps_Snap-3b828c566e03ecc5c6bc398852dc58546d857678.tar.gz
android_packages_apps_Snap-3b828c566e03ecc5c6bc398852dc58546d857678.tar.bz2
android_packages_apps_Snap-3b828c566e03ecc5c6bc398852dc58546d857678.zip
Merge "SnapdragonCamera: Stop face detection when preview is stopped."
-rw-r--r--src/com/android/camera/PhotoModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 1dd09dfd7..14e80ceb2 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2652,6 +2652,7 @@ public class PhotoModule
}
setCameraState(PREVIEW_STOPPED);
if (mFocusManager != null) mFocusManager.onPreviewStopped();
+ stopFaceDetection();
}
@SuppressWarnings("deprecation")