am 58296baa: Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev

* commit '58296baa78b56401874ec719727243e9c0b0266e': Fix startFaceDetection will fail after taking a picture.
2012-05-30 09:47:39 -07:00
parent 9ca07d048f 58296baa78
commit ea2acd48dc
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1059,6 +1059,7 @@ public class Camera {
        }

        native_takePicture(msgType);
+        mFaceDetectionRunning = false;
    }

    /**