Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-11 19:23:11 +00:00
committed by Android (Google) Code Review
parent 3e4e9e234a daf20731ca
commit 0cfad57566
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
View File

@@ -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);
}