Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev

Wei Huang · Android (Google) Code Review · commit 58296baa78b5 · 2012-05-30T09:43:20.000-07:00
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
@@ -1059,6 +1059,7 @@ public final void takePicture(ShutterCallback shutter, PictureCallback raw,
         }
 
         native_takePicture(msgType);
+        mFaceDetectionRunning = false;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1059,6 +1059,7 @@ public final void takePicture(ShutterCallback shutter, PictureCallback raw,`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`	`1061`	`native_takePicture(msgType);`
	`1062`	`+ mFaceDetectionRunning = false;`
`1062`	`1063`	`}`
`1063`	`1064`
`1064`	`1065`	`/**`