1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 8acb52dee..4f32a1bf2 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1567,6 +1567,13 @@ public class PhotoModule
                 mParameters.remove(CameraSettings.KEY_QC_LEGACY_BURST);
             }
 
+            // Unlock AE&AWB during longshot
+            if (LONGSHOT == mCameraState) {
+                mFocusManager.setAeAwbLock(false);
+                setAutoExposureLockIfSupported();
+                setAutoWhiteBalanceLockIfSupported();
+            }
+
             mCameraDevice.setParameters(mParameters);
             mParameters = mCameraDevice.getParameters();
         }