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

am: 9d78716

* commit '9d78716131e40157ea449034847ee14536567aa1':
  Camera2: Reconnect camera service for listeners

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

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