Merge "Camera: Add new hidden API for camera open/close callback" into rvc-dev am: abb2d5847d (c857337b) · Commits · e / os / android_frameworks_base

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

+91 −0

Original line number	Diff line number	Diff line
		@@ -846,6 +846,33 @@ public final class CameraManager {
		@NonNull String physicalCameraId) {
		// default empty implementation
		}

		/**
		* A camera device has been opened by an application.
		*
		* <p>The default implementation of this method does nothing.</p>
		*
		* @param cameraId The unique identifier of the new camera.
		* @param packageId The package Id of the application opening the camera.
		*
		* @see #onCameraClosed
		*/
		/** @hide */
		public void onCameraOpened(@NonNull String cameraId, @NonNull String packageId) {
		// default empty implementation
		}

		/**
		* A previously-opened camera has been closed.
		*
		* <p>The default implementation of this method does nothing.</p>
		*
		* @param cameraId The unique identifier of the closed camera.
		*/
		/** @hide */
		public void onCameraClosed(@NonNull String cameraId) {
		// default empty implementation
		}
		}

		/**
		@@ -1276,6 +1303,12 @@ public final class CameraManager {
		}
		@Override
		public void onCameraAccessPrioritiesChanged() {
		}
		@Override
		public void onCameraOpened(String id, String clientPackageId) {
		}
		@Override
		public void onCameraClosed(String id) {
		}};

		String[] cameraIds = null;
		@@ -1503,6 +1536,38 @@ public final class CameraManager {
		}
		}

		private void postSingleCameraOpenedUpdate(final AvailabilityCallback callback,
		final Executor executor, final String id, final String packageId) {
		final long ident = Binder.clearCallingIdentity();
		try {
		executor.execute(
		new Runnable() {
		@Override
		public void run() {
		callback.onCameraOpened(id, packageId);
		}
		});
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		private void postSingleCameraClosedUpdate(final AvailabilityCallback callback,
		final Executor executor, final String id) {
		final long ident = Binder.clearCallingIdentity();
		try {
		executor.execute(
		new Runnable() {
		@Override
		public void run() {
		callback.onCameraClosed(id);
		}
		});
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		private void postSingleUpdate(final AvailabilityCallback callback, final Executor executor,
		final String id, final String physicalId, final int status) {
		if (isAvailable(status)) {
		@@ -1846,6 +1911,32 @@ public final class CameraManager {
		}
		}

		@Override
		public void onCameraOpened(String cameraId, String clientPackageId) {
		synchronized (mLock) {
		final int callbackCount = mCallbackMap.size();
		for (int i = 0; i < callbackCount; i++) {
		Executor executor = mCallbackMap.valueAt(i);
		final AvailabilityCallback callback = mCallbackMap.keyAt(i);

		postSingleCameraOpenedUpdate(callback, executor, cameraId, clientPackageId);
		}
		}
		}

		@Override
		public void onCameraClosed(String cameraId) {
		synchronized (mLock) {
		final int callbackCount = mCallbackMap.size();
		for (int i = 0; i < callbackCount; i++) {
		Executor executor = mCallbackMap.valueAt(i);
		final AvailabilityCallback callback = mCallbackMap.keyAt(i);

		postSingleCameraClosedUpdate(callback, executor, cameraId);
		}
		}
		}

		/**
		* Try to connect to camera service after some delay if any client registered camera
		* availability callback or torch status callback.

core/res/AndroidManifest.xml

+10 −1

Original line number	Diff line number	Diff line
		@@ -1315,6 +1315,15 @@
		android:description="@string/permdesc_systemCamera"
		android:protectionLevel="system\|signature" />

		<!-- Allows receiving the camera service notifications when a camera is opened
		(by a certain application package) or closed.
		@hide -->
		<permission android:name="android.permission.CAMERA_OPEN_CLOSE_LISTENER"
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_cameraOpenCloseListener"
		android:description="@string/permdesc_cameraOpenCloseListener"
		android:protectionLevel="signature" />

		<!-- ====================================================================== -->
		<!-- Permissions for accessing the device sensors -->
		<!-- ====================================================================== -->

core/res/res/values/strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -1166,6 +1166,11 @@
		<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] -->
		<string name="permdesc_systemCamera">This privileged \| system app can take pictures and record videos using a system camera at any time. Requires the android.permission.CAMERA permission to be held by the app as well</string>

		<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] -->
		<string name="permlab_cameraOpenCloseListener">Allow an application or service to receive callbacks about camera devices being opened or closed.</string>
		<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] -->
		<string name="permdesc_cameraOpenCloseListener">This signature app can receive callbacks when any camera device is being opened (by what application package) or closed.</string>

		<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
		<string name="permlab_vibrate">control vibration</string>
		<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

data/etc/com.android.systemui.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,5 +63,6 @@
		<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
		<permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
		<permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />
		<permission name="android.permission.CAMERA_OPEN_CLOSE_LISTENER" />
		</privapp-permissions>
		</permissions>

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,15 @@ public class CameraBinderTest extends AndroidTestCase {
		public void onCameraAccessPrioritiesChanged() {
		Log.v(TAG, "Camera access permission change");
		}
		@Override
		public void onCameraOpened(String cameraId, String clientPackageName) {
		Log.v(TAG, String.format("Camera %s is opened by client package %s",
		cameraId, clientPackageName));
		}
		@Override
		public void onCameraClosed(String cameraId) {
		Log.v(TAG, String.format("Camera %s is closed", cameraId));
		}
		}

		/**