Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7d8550 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

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

am: 0cfad575

Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a
parents b463d29a 0cfad575

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

+6 −0
Original line number Diff line number Diff line
@@ -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);

        }