Camera: Async camera manager calls should use executors (f977ff99) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15902,8 +15902,11 @@ package android.hardware.camera2 {
	method public android.hardware.camera2.CameraCharacteristics getCameraCharacteristics(java.lang.String) throws android.hardware.camera2.CameraAccessException;		method public android.hardware.camera2.CameraCharacteristics getCameraCharacteristics(java.lang.String) throws android.hardware.camera2.CameraAccessException;
	method public java.lang.String[] getCameraIdList() throws android.hardware.camera2.CameraAccessException;		method public java.lang.String[] getCameraIdList() throws android.hardware.camera2.CameraAccessException;
	method public void openCamera(java.lang.String, android.hardware.camera2.CameraDevice.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;		method public void openCamera(java.lang.String, android.hardware.camera2.CameraDevice.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
			method public void openCamera(java.lang.String, java.util.concurrent.Executor, android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;
	method public void registerAvailabilityCallback(android.hardware.camera2.CameraManager.AvailabilityCallback, android.os.Handler);		method public void registerAvailabilityCallback(android.hardware.camera2.CameraManager.AvailabilityCallback, android.os.Handler);
			method public void registerAvailabilityCallback(java.util.concurrent.Executor, android.hardware.camera2.CameraManager.AvailabilityCallback);
	method public void registerTorchCallback(android.hardware.camera2.CameraManager.TorchCallback, android.os.Handler);		method public void registerTorchCallback(android.hardware.camera2.CameraManager.TorchCallback, android.os.Handler);
			method public void registerTorchCallback(java.util.concurrent.Executor, android.hardware.camera2.CameraManager.TorchCallback);
	method public void setTorchMode(java.lang.String, boolean) throws android.hardware.camera2.CameraAccessException;		method public void setTorchMode(java.lang.String, boolean) throws android.hardware.camera2.CameraAccessException;
	method public void unregisterAvailabilityCallback(android.hardware.camera2.CameraManager.AvailabilityCallback);		method public void unregisterAvailabilityCallback(android.hardware.camera2.CameraManager.AvailabilityCallback);
	method public void unregisterTorchCallback(android.hardware.camera2.CameraManager.TorchCallback);		method public void unregisterTorchCallback(android.hardware.camera2.CameraManager.TorchCallback);

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

+89 −13

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.hardware.camera2;		package android.hardware.camera2;

			import android.annotation.CallbackExecutor;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
	@@ -133,6 +134,27 @@ public final class CameraManager {
	CameraDeviceImpl.checkAndWrapHandler(handler));		CameraDeviceImpl.checkAndWrapHandler(handler));
	}		}

			/**
			* Register a callback to be notified about camera device availability.
			*
			* <p>The behavior of this method matches that of
			* {@link #registerAvailabilityCallback(AvailabilityCallback, Handler)},
			* except that it uses {@link java.util.concurrent.Executor} as an argument
			* instead of {@link android.os.Handler}.</p>
			*
			* @param executor The executor which will be used to invoke the callback.
			* @param callback the new callback to send camera availability notices to
			*
			* @throws IllegalArgumentException if the executor is {@code null}.
			*/
			public void registerAvailabilityCallback(@NonNull @CallbackExecutor Executor executor,
			@NonNull AvailabilityCallback callback) {
			if (executor == null) {
			throw new IllegalArgumentException("executor was null");
			}
			CameraManagerGlobal.get().registerAvailabilityCallback(callback, executor);
			}

	/**		/**
	* Remove a previously-added callback; the callback will no longer receive connection and		* Remove a previously-added callback; the callback will no longer receive connection and
	* disconnection callbacks.		* disconnection callbacks.
	@@ -172,6 +194,27 @@ public final class CameraManager {
	CameraDeviceImpl.checkAndWrapHandler(handler));		CameraDeviceImpl.checkAndWrapHandler(handler));
	}		}

			/**
			* Register a callback to be notified about torch mode status.
			*
			* <p>The behavior of this method matches that of
			* {@link #registerTorchCallback(TorchCallback, Handler)},
			* except that it uses {@link java.util.concurrent.Executor} as an argument
			* instead of {@link android.os.Handler}.</p>
			*
			* @param executor The executor which will be used to invoke the callback
			* @param callback The new callback to send torch mode status to
			*
			* @throws IllegalArgumentException if the executor is {@code null}.
			*/
			public void registerTorchCallback(@NonNull @CallbackExecutor Executor executor,
			@NonNull TorchCallback callback) {
			if (executor == null) {
			throw new IllegalArgumentException("executor was null");
			}
			CameraManagerGlobal.get().registerTorchCallback(callback, executor);
			}

	/**		/**
	* Remove a previously-added callback; the callback will no longer receive torch mode status		* Remove a previously-added callback; the callback will no longer receive torch mode status
	* callbacks.		* callbacks.
	@@ -248,7 +291,7 @@ public final class CameraManager {
	*		*
	* @param cameraId The unique identifier of the camera device to open		* @param cameraId The unique identifier of the camera device to open
	* @param callback The callback for the camera. Must not be null.		* @param callback The callback for the camera. Must not be null.
	* @param handler The handler to invoke the callback on. Must not be null.		* @param executor The executor to invoke the callback with. Must not be null.
	* @param uid The UID of the application actually opening the camera.		* @param uid The UID of the application actually opening the camera.
	* Must be USE_CALLING_UID unless the caller is a service		* Must be USE_CALLING_UID unless the caller is a service
	* that is trusted to open the device on behalf of an		* that is trusted to open the device on behalf of an
	@@ -267,7 +310,7 @@ public final class CameraManager {
	* @see android.app.admin.DevicePolicyManager#setCameraDisabled		* @see android.app.admin.DevicePolicyManager#setCameraDisabled
	*/		*/
	private CameraDevice openCameraDeviceUserAsync(String cameraId,		private CameraDevice openCameraDeviceUserAsync(String cameraId,
	CameraDevice.StateCallback callback, Handler handler, final int uid)		CameraDevice.StateCallback callback, Executor executor, final int uid)
	throws CameraAccessException {		throws CameraAccessException {
	CameraCharacteristics characteristics = getCameraCharacteristics(cameraId);		CameraCharacteristics characteristics = getCameraCharacteristics(cameraId);
	CameraDevice device = null;		CameraDevice device = null;
	@@ -280,7 +323,7 @@ public final class CameraManager {
	new android.hardware.camera2.impl.CameraDeviceImpl(		new android.hardware.camera2.impl.CameraDeviceImpl(
	cameraId,		cameraId,
	callback,		callback,
	handler,		executor,
	characteristics,		characteristics,
	mContext.getApplicationInfo().targetSdkVersion);		mContext.getApplicationInfo().targetSdkVersion);

	@@ -421,7 +464,47 @@ public final class CameraManager {
	@NonNull final CameraDevice.StateCallback callback, @Nullable Handler handler)		@NonNull final CameraDevice.StateCallback callback, @Nullable Handler handler)
	throws CameraAccessException {		throws CameraAccessException {

	openCameraForUid(cameraId, callback, handler, USE_CALLING_UID);		openCameraForUid(cameraId, callback, CameraDeviceImpl.checkAndWrapHandler(handler),
			USE_CALLING_UID);
			}

			/**
			* Open a connection to a camera with the given ID.
			*
			* <p>The behavior of this method matches that of
			* {@link #openCamera(String, StateCallback, Handler)}, except that it uses
			* {@link java.util.concurrent.Executor} as an argument instead of
			* {@link android.os.Handler}.</p>
			*
			* @param cameraId
			* The unique identifier of the camera device to open
			* @param executor
			* The executor which will be used when invoking the callback.
			* @param callback
			* The callback which is invoked once the camera is opened
			*
			* @throws CameraAccessException if the camera is disabled by device policy,
			* has been disconnected, or is being used by a higher-priority camera API client.
			*
			* @throws IllegalArgumentException if cameraId, the callback or the executor was null,
			* or the cameraId does not match any currently or previously available
			* camera device.
			*
			* @throws SecurityException if the application does not have permission to
			* access the camera
			*
			* @see #getCameraIdList
			* @see android.app.admin.DevicePolicyManager#setCameraDisabled
			*/
			@RequiresPermission(android.Manifest.permission.CAMERA)
			public void openCamera(@NonNull String cameraId,
			@NonNull @CallbackExecutor Executor executor,
			@NonNull final CameraDevice.StateCallback callback)
			throws CameraAccessException {
			if (executor == null) {
			throw new IllegalArgumentException("executor was null");
			}
			openCameraForUid(cameraId, callback, executor, USE_CALLING_UID);
	}		}

	/**		/**
	@@ -440,7 +523,7 @@ public final class CameraManager {
	* @hide		* @hide
	*/		*/
	public void openCameraForUid(@NonNull String cameraId,		public void openCameraForUid(@NonNull String cameraId,
	@NonNull final CameraDevice.StateCallback callback, @Nullable Handler handler,		@NonNull final CameraDevice.StateCallback callback, @NonNull Executor executor,
	int clientUid)		int clientUid)
	throws CameraAccessException {		throws CameraAccessException {

	@@ -448,19 +531,12 @@ public final class CameraManager {
	throw new IllegalArgumentException("cameraId was null");		throw new IllegalArgumentException("cameraId was null");
	} else if (callback == null) {		} else if (callback == null) {
	throw new IllegalArgumentException("callback was null");		throw new IllegalArgumentException("callback was null");
	} else if (handler == null) {
	if (Looper.myLooper() != null) {
	handler = new Handler();
	} else {
	throw new IllegalArgumentException(
	"Handler argument is null, but no looper exists in the calling thread");
	}
	}		}
	if (CameraManagerGlobal.sCameraServiceDisabled) {		if (CameraManagerGlobal.sCameraServiceDisabled) {
	throw new IllegalArgumentException("No cameras available on device");		throw new IllegalArgumentException("No cameras available on device");
	}		}

	openCameraDeviceUserAsync(cameraId, callback, handler, clientUid);		openCameraDeviceUserAsync(cameraId, callback, executor, clientUid);
	}		}

	/**		/**

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -240,14 +240,14 @@ public class CameraDeviceImpl extends CameraDevice
	}		}
	};		};

	public CameraDeviceImpl(String cameraId, StateCallback callback, Handler handler,		public CameraDeviceImpl(String cameraId, StateCallback callback, Executor executor,
	CameraCharacteristics characteristics, int appTargetSdkVersion) {		CameraCharacteristics characteristics, int appTargetSdkVersion) {
	if (cameraId == null \|\| callback == null \|\| handler == null \|\| characteristics == null) {		if (cameraId == null \|\| callback == null \|\| executor == null \|\| characteristics == null) {
	throw new IllegalArgumentException("Null argument given");		throw new IllegalArgumentException("Null argument given");
	}		}
	mCameraId = cameraId;		mCameraId = cameraId;
	mDeviceCallback = callback;		mDeviceCallback = callback;
	mDeviceExecutor = checkAndWrapHandler(handler);		mDeviceExecutor = executor;
	mCharacteristics = characteristics;		mCharacteristics = characteristics;
	mAppTargetSdkVersion = appTargetSdkVersion;		mAppTargetSdkVersion = appTargetSdkVersion;