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

am: 0cfad57566

Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a

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

@@ -504,12 +504,18 @@ public class CameraDeviceUserShim implements ICameraDeviceUser {
         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);
         }