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

Commit e36829ee authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "Fix legacy disconnect callback." into mnc-dev

parents 7d441225 b44864e7

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

+12 −2
Original line number Diff line number Diff line
@@ -187,8 +187,18 @@ public class RequestThreadManager { 
    private final Camera.ErrorCallback mErrorCallback = new Camera.ErrorCallback() {

        @Override

        public void onError(int i, Camera camera) {

            switch(i) {

                case Camera.CAMERA_ERROR_EVICTED: {

                    flush();

                    mDeviceState.setError(

                            CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DISCONNECTED);

                } break;

                default:  {

                    Log.e(TAG, "Received error " + i + " from the Camera1 ErrorCallback");

            mDeviceState.setError(CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE);

                    mDeviceState.setError(

                            CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE);

                } break;

            }

        }

    };