diff options
| author | xianming wang <mingwax@codeaurora.org> | 2017-10-27 15:12:32 +0800 |
|---|---|---|
| committer | xianming wang <mingwax@codeaurora.org> | 2017-10-27 15:15:17 +0800 |
| commit | 9761b535108dde4f39cacfb990936e2dd599b6b0 (patch) | |
| tree | d1ab451fcfb9519c75394da3ac63fab6c789b468 /src | |
| parent | 32ab018b128b4cf16bda502e48c5cfbb86300e60 (diff) | |
| download | android_packages_apps_Snap-9761b535108dde4f39cacfb990936e2dd599b6b0.tar.gz android_packages_apps_Snap-9761b535108dde4f39cacfb990936e2dd599b6b0.tar.bz2 android_packages_apps_Snap-9761b535108dde4f39cacfb990936e2dd599b6b0.zip | |
SnapdragonCamera: Fix Set CONTROL_AE_MODE is OFF status
Fix Set the CONTROL_AE_MODE is OFF status.
CRs-Fixed: 2128698
Change-Id: I096ed269a75ac46273122eefe8d85fc7eced62e5
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 6a21cf57a..536acea30 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2063,18 +2063,20 @@ public class CaptureModule implements CameraModule, PhotoController, private void applySettingsForCapture(CaptureRequest.Builder builder, int id) { builder.set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_IDLE); applyJpegQuality(builder); - applyCommonSettings(builder, id); applyFlash(builder, id); + applyCommonSettings(builder, id); } private void applySettingsForPrecapture(CaptureRequest.Builder builder, int id) { builder.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START); - applyCommonSettings(builder, id); // For long shot, torch mode is used - if (!mLongshotActive) + if (!mLongshotActive) { applyFlash(builder, id); + } + + applyCommonSettings(builder, id); } private void applySettingsForLockExposure(CaptureRequest.Builder builder, int id) { @@ -3983,8 +3985,8 @@ public class CaptureModule implements CameraModule, PhotoController, private void initializePreviewConfiguration(int id) { mPreviewRequestBuilder[id].set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest .CONTROL_AF_TRIGGER_IDLE); - applyCommonSettings(mPreviewRequestBuilder[id], id); applyFlash(mPreviewRequestBuilder[id], id); + applyCommonSettings(mPreviewRequestBuilder[id], id); } public float getZoomValue() { |