From daf20731ca75b829302ad3dc81fc6df431959475 Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Thu, 10 Aug 2017 15:41:50 -0700 Subject: [PATCH] Camera: fix legacy device CTS failure Bug: 64259581 Test: emulator CTS failure is fixed Change-Id: I9988ffb7877c3f5d62c82ab3c7b8744720824fba --- .../hardware/camera2/legacy/CameraDeviceUserShim.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java index f87d8c1401c53..d8df9a067c634 100644 --- a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java +++ b/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); }