Merge "Camera2: Reconnect camera service for listeners" into nyc-dev (9d787161) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1099,6 +1099,11 @@ public final class CameraManager {
	if (oldHandler == null) {		if (oldHandler == null) {
	updateCallbackLocked(callback, handler);		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) {		if (oldHandler == null) {
	updateTorchCallbackLocked(callback, handler);		updateTorchCallbackLocked(callback, handler);
	}		}

			// If not connected to camera service, schedule a reconnect to camera service.
			if (mCameraService == null) {
			scheduleCameraServiceReconnectionLocked();
			}
	}		}
	}		}