diff options
| author | Wei Huang <weih@google.com> | 2012-05-30 09:43:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-30 09:43:20 -0700 |
| commit | 58296baa78b56401874ec719727243e9c0b0266e (patch) | |
| tree | 843d9344493871a22df3a6475b21dae06e152919 /core | |
| parent | d8c5f10c10ea1a8708481eac52ee573d5c3b6a67 (diff) | |
| parent | e9c6c9ccfde7a642a4c0554e2d066f3dbbea98ce (diff) | |
| download | frameworks_base-58296baa78b56401874ec719727243e9c0b0266e.zip frameworks_base-58296baa78b56401874ec719727243e9c0b0266e.tar.gz frameworks_base-58296baa78b56401874ec719727243e9c0b0266e.tar.bz2 | |
Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 89068e7..035a7c6 100644 --- 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; } /** |