Camera2: Reconnect camera service for listeners
Reconnect to camera service if camera service is down when
registering a device availability or torch status listener.
Bug: 22483263
Change-Id: I56868b301151175e18aa1932a8b903e840bcac50
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 04e64af..ffd9d89 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1099,6 +1099,11 @@
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 @@
if (oldHandler == null) {
updateTorchCallbackLocked(callback, handler);
}
+
+ // If not connected to camera service, schedule a reconnect to camera service.
+ if (mCameraService == null) {
+ scheduleCameraServiceReconnectionLocked();
+ }
}
}