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

Commit 3699ef18 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-merger
Browse files

Merge "Camera2: Reconnect camera service for listeners" into nyc-dev 

am: 9d787161

* commit '9d787161':
  Camera2: Reconnect camera service for listeners
parents 706928df 9d787161

core/java/android/hardware/camera2/CameraManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,11 @@ public final class CameraManager { 
                if (oldHandler == null) {

                    updateCallbackLocked(callback, handler);

                }



                // If not connected to camera service, schedule a reconnect to camera service.

                if (mCameraService == null) {

                    scheduleCameraServiceReconnectionLocked();

                }

            }

        }
@@ -1123,6 +1128,11 @@ public final class CameraManager { 
                if (oldHandler == null) {

                    updateTorchCallbackLocked(callback, handler);

                }



                // If not connected to camera service, schedule a reconnect to camera service.

                if (mCameraService == null) {

                    scheduleCameraServiceReconnectionLocked();

                }

            }

        }