commit df7d8550728313d4b6a9d8c5d65fbbfdf0716347
author Yin-Chia Yeh <yinchiayeh@google.com> Fri Aug 11 19:44:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 11 19:44:50 2017 +0000
tree a2ef2948928807707c432771e8217b6cca6c5168
parent b463d29a62572dc49c4ca7341530fac4be6b2b74
parent 0cfad5756654b4f8237cf33b3d21819d49b7f02f

Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
am: 0cfad57566

Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a

core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java

diff --git a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
index f87d8c1..d8df9a0 100644
--- a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
+++ b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
@@ -504,12 +504,18 @@
         if (mLegacyDevice.isClosed()) {
             String err = "Cannot end configure, device has been closed.";
             Log.e(TAG, err);
+            synchronized(mConfigureLock) {
+                mConfiguring = false;
+            }
             throw new ServiceSpecificException(ICameraService.ERROR_DISCONNECTED, err);
         }
 
         if (operatingMode != ICameraDeviceUser.NORMAL_MODE) {
             String err = "LEGACY devices do not support this operating mode";
             Log.e(TAG, err);
+            synchronized(mConfigureLock) {
+                mConfiguring = false;
+            }
             throw new ServiceSpecificException(ICameraService.ERROR_ILLEGAL_ARGUMENT, err);
         }