From 0ac408ef431427b660bc94ef613f006211cead0f Mon Sep 17 00:00:00 2001 From: Chien-Yu Chen Date: Thu, 17 Mar 2016 10:51:25 -0700 Subject: [PATCH] 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 --- core/java/android/hardware/camera2/CameraManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 04e64af8c25e0..ffd9d8969e65c 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/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(); + } } }