summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2017-05-30 20:00:11 +0200
committerDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2017-05-30 18:11:05 +0000
commitc737df520a87207f83c864c2876685e190c1113e (patch)
treea9b3105edcc74a9c0e37ef6bdfbac7c2d2717c99
parent09a7a0b4e347a08335c086a8de48e938e56d919c (diff)
downloadandroid_packages_apps_Snap-c737df520a87207f83c864c2876685e190c1113e.zip
android_packages_apps_Snap-c737df520a87207f83c864c2876685e190c1113e.tar.gz
android_packages_apps_Snap-c737df520a87207f83c864c2876685e190c1113e.tar.bz2
Revert "Snap: CaptureModule: lock exposure also when precapture trigger is started"
This reverts commit 48f0e427c4d60f597235954d9bc910c5c8980dbe. Change-Id: Ie77b36e1770b2ce8999e3d98fb2cf811f2764fd1
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index f56fe6f..7a9f672 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -574,13 +574,10 @@ 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()) {
- Log.d(TAG, "updateCaptureStateMachine: hashes are equal, lock exposure");
+ if (mPrecaptureRequestHashCode[id] == result.getRequest().hashCode())
lockExposure(id);
- }
}
break;
}