Commit eef3fe0a authored May 30, 2012 by Wei Huang Committed by Android Git Automerger May 30, 2012

am ea2acd48: am 58296baa: Merge "Fix startFaceDetection will fail after taking...

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

* commit 'ea2acd48':
  Fix startFaceDetection will fail after taking a picture.

parents 022a6563 ea2acd48

core/java/android/hardware/Camera.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1059,6 +1059,7 @@ public class Camera {
	}		}

	native_takePicture(msgType);		native_takePicture(msgType);
			mFaceDetectionRunning = false;
	}		}

	/**		/**