diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-10-24 14:42:41 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2011-10-24 14:44:55 +0800 |
commit | 3ade8655b875f3fb4b8a4bfd09841f77e4fbe29d (patch) | |
tree | 8ebe320acd95b10abcd54b6bf69339b7ab348b58 /src/com/android/camera/Camera.java | |
parent | 37eac5970dcac64ddb547f32f4a642c77b83a28f (diff) | |
download | LegacyCamera-3ade8655b875f3fb4b8a4bfd09841f77e4fbe29d.zip LegacyCamera-3ade8655b875f3fb4b8a4bfd09841f77e4fbe29d.tar.gz LegacyCamera-3ade8655b875f3fb4b8a4bfd09841f77e4fbe29d.tar.bz2 |
Fix startFaceDetection RuntimeException.
Sometimes startFaceDetection is called twice and exception
is thrown.
Reproduction steps:
1. Set screen lock to none.
2. Start camera app and press power key to turn off screen immediately.
3. Start camera app.
bug:5497940
Change-Id: I3337d70e473943f5306cb459ce79c0faa45b77af
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r-- | src/com/android/camera/Camera.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 931095e..1bedb4f 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1458,7 +1458,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, initializeCapabilities(); resetExposureCompensation(); startPreview(); - startFaceDetection(); + if (mFirstTimeInitialized) startFaceDetection(); } catch (CameraHardwareException e) { Util.showErrorAndFinish(this, R.string.cannot_connect_camera); return; @@ -1682,7 +1682,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, // display rotation in onCreate may not be what we want. if (mCameraState == PREVIEW_STOPPED) { startPreview(); - startFaceDetection(); + if (mFirstTimeInitialized) startFaceDetection(); } else { if (Util.getDisplayRotation(this) != mDisplayRotation) { setDisplayOrientation(); |