diff options
author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2017-02-25 12:49:16 +0100 |
---|---|---|
committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2017-02-25 12:53:35 +0100 |
commit | 48f0e427c4d60f597235954d9bc910c5c8980dbe (patch) | |
tree | abac4761e8dd5120bb983e179983fe88c6ca0cc8 | |
parent | a1794ca6a0d9d292394b471ebc6a33222c39db5b (diff) | |
download | android_packages_apps_Snap-48f0e427c4d60f597235954d9bc910c5c8980dbe.tar.gz android_packages_apps_Snap-48f0e427c4d60f597235954d9bc910c5c8980dbe.tar.bz2 android_packages_apps_Snap-48f0e427c4d60f597235954d9bc910c5c8980dbe.zip |
Snap: CaptureModule: lock exposure also when precapture trigger is started
Fixes camera hang on LG G4 when flash mode is auto and flash is required.
Change-Id: I258fed2364e37f6b40ee5e13f3359167ce13ff8f
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index c0ccca5ab..22b8e19ac 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -574,10 +574,13 @@ public class CaptureModule extends BaseModule<CaptureUI> implements PhotoControl Log.d(TAG, "STATE_WAITING_PRECAPTURE id: " + id + " afState: " + afState + " aeState:" + aeState); if (aeState == null || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE || + aeState == CaptureResult.CONTROL_AE_PRECAPTURE_TRIGGER_START || aeState == CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) { - if (mPrecaptureRequestHashCode[id] == result.getRequest().hashCode()) + if (mPrecaptureRequestHashCode[id] == result.getRequest().hashCode()) { + Log.d(TAG, "updateCaptureStateMachine: hashes are equal, lock exposure"); lockExposure(id); + } } break; } |