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

Commit 6eaad329 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am a43b5061: am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev 

* commit 'a43b5061':
  Fix legacy disconnect callback.
parents 6158d195 a43b5061

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;

            }

        }

    };