Merge "[CDM] Make CDM transport APIs available to the system services" into udc-dev-plus-aosp (442e30b8) · Commits · e / os / android_frameworks_base

core/api/module-lib-current.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ package android {
		field public static final String CONTROL_AUTOMOTIVE_GNSS = "android.permission.CONTROL_AUTOMOTIVE_GNSS";
		field public static final String GET_INTENT_SENDER_INTENT = "android.permission.GET_INTENT_SENDER_INTENT";
		field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";
		field public static final String USE_COMPANION_TRANSPORTS = "android.permission.USE_COMPANION_TRANSPORTS";
		}

		}
		@@ -81,6 +82,29 @@ package android.app.admin {

		}

		package android.companion {

		public final class CompanionDeviceManager {
		method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnMessageReceivedListener(@NonNull java.util.concurrent.Executor, int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener);
		method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnTransportsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener);
		method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnMessageReceivedListener(int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener);
		method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnTransportsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener);
		method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void sendMessage(int, @NonNull byte[], @NonNull int[]);
		field public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 1667729539; // 0x63678883
		field public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 1669491075; // 0x63826983
		field public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 1669494629; // 0x63827765
		}

		public static interface CompanionDeviceManager.OnMessageReceivedListener {
		method public void onMessageReceived(int, @NonNull byte[]);
		}

		public static interface CompanionDeviceManager.OnTransportsChangedListener {
		method public void onTransportsChanged(@NonNull java.util.List<android.companion.AssociationInfo>);
		}

		}

		package android.content {

		public abstract class ContentProvider implements android.content.ComponentCallbacks2 {

core/api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -852,6 +852,10 @@ package android.companion {
		method @NonNull public android.companion.AssociationInfo.Builder setTimeApproved(long);
		}

		public final class CompanionDeviceManager {
		field public static final int MESSAGE_REQUEST_PING = 1669362552; // 0x63807378
		}

		public abstract class CompanionDeviceService extends android.app.Service {
		method public void onBindCompanionDeviceService(@NonNull android.content.Intent);
		}

core/java/android/companion/CompanionDeviceManager.java

+72 −24

Original line number	Diff line number	Diff line
		@@ -20,7 +20,9 @@ import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMIN
		import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION;
		import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER;
		import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH;
		import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;

		import android.annotation.CallbackExecutor;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -28,6 +30,7 @@ import android.annotation.RequiresPermission;
		import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.annotation.UserHandleAware;
		import android.app.Activity;
		import android.app.ActivityManager;
		@@ -215,6 +218,34 @@ public final class CompanionDeviceManager {
		public static final String COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME =
		"com.android.companiondevicemanager";

		/**
		* Test message type without a designated callback.
		*
		* @hide
		*/
		@TestApi public static final int MESSAGE_REQUEST_PING = 0x63807378; // ?PIN
		/**
		* Message header assigned to the remote authentication handshakes.
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 0x63827765; // ?RMA
		/**
		* Message header assigned to the telecom context sync metadata.
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 0x63678883; // ?CXS
		/**
		* Message header assigned to the permission restore request.
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 0x63826983; // ?RES

		/**
		* Callback for applications to receive updates about and the outcome of
		* {@link AssociationRequest} issued via {@code associate()} call.
		@@ -804,28 +835,36 @@ public final class CompanionDeviceManager {
		}

		/**
		* Listener for any changes to {@link com.android.server.companion.transport.Transport}.
		* Listener for any changes to the list of attached transports.
		*
		* @see com.android.server.companion.transport.Transport
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		public interface OnTransportsChangedListener {
		/**
		* Invoked when a change occurs to any of the transports
		* Invoked when a transport is attached or detached.
		*
		* @param associations all the associations which have connected transports
		* @param associations all the associations which have connected transports.
		*/
		void onTransportsChanged(@NonNull List<AssociationInfo> associations);
		}

		/**
		* Register a listener for any changes to
		* {@link com.android.server.companion.transport.Transport}. Your app will receive a callback to
		* {@link OnTransportsChangedListener} immediately with all the existing transports.
		* Adds a listener for any changes to the list of attached transports.
		* {@link OnTransportsChangedListener#onTransportsChanged(List)} will be triggered with a list
		* of existing transports when a transport is detached or a new transport is attached.
		*
		* @see com.android.server.companion.transport.Transport
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		@RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)
		public void addOnTransportsChangedListener(
		@NonNull Executor executor, @NonNull OnTransportsChangedListener listener) {
		@NonNull @CallbackExecutor Executor executor,
		@NonNull OnTransportsChangedListener listener) {
		final OnTransportsChangedListenerProxy proxy = new OnTransportsChangedListenerProxy(
		executor, listener);
		try {
		@@ -836,11 +875,14 @@ public final class CompanionDeviceManager {
		}

		/**
		* Unregister a listener to stop receiving any changes to
		* {@link com.android.server.companion.transport.Transport}.
		* Removes the registered listener for any changes to the list of attached transports.
		*
		* @see com.android.server.companion.transport.Transport
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		@RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)
		public void removeOnTransportsChangedListener(
		@NonNull OnTransportsChangedListener listener) {
		final OnTransportsChangedListenerProxy proxy = new OnTransportsChangedListenerProxy(
		@@ -853,11 +895,16 @@ public final class CompanionDeviceManager {
		}

		/**
		* Send a message to remote devices
		* Sends a message to associated remote devices. The target associations must already have a
		* connected transport.
		*
		* @see #attachSystemDataTransport(int, InputStream, OutputStream)
		*
		* @hide
		*/
		public void sendMessage(int messageType, byte[] data, int[] associationIds) {
		@SystemApi(client = MODULE_LIBRARIES)
		@RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)
		public void sendMessage(int messageType, @NonNull byte[] data, @NonNull int[] associationIds) {
		try {
		mService.sendMessage(messageType, data, associationIds);
		} catch (RemoteException e) {
		@@ -866,28 +913,30 @@ public final class CompanionDeviceManager {
		}

		/**
		* Listener when a message is received for the registered message type
		* Listener that triggers a callback when a message is received through a connected transport.
		*
		* @see #addOnMessageReceivedListener(Executor, int, OnMessageReceivedListener)
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		public interface OnMessageReceivedListener {
		/**
		* Called when a message is received
		* Called when a message is received.
		*/
		void onMessageReceived(int associationId, byte[] data);
		void onMessageReceived(int associationId, @NonNull byte[] data);
		}

		/**
		* Register a listener to receive callbacks when a message is received by the given type
		*
		* @see com.android.server.companion.transport.Transport for supported message types
		* Adds a listener to trigger callbacks when messages of given type are received.
		*
		* @hide
		*/
		public void addOnMessageReceivedListener(@NonNull Executor executor, int messageType,
		OnMessageReceivedListener listener) {
		@SystemApi(client = MODULE_LIBRARIES)
		@RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)
		public void addOnMessageReceivedListener(
		@NonNull @CallbackExecutor Executor executor, int messageType,
		@NonNull OnMessageReceivedListener listener) {
		final OnMessageReceivedListenerProxy proxy = new OnMessageReceivedListenerProxy(
		executor, listener);
		try {
		@@ -898,15 +947,14 @@ public final class CompanionDeviceManager {
		}

		/**
		* Unregister a listener to stop receiving callbacks when a message is received by the given
		* type
		*
		* @see com.android.server.companion.transport.Transport for supported message types
		* Removes the registered listener for received messages of given type.
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		@RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)
		public void removeOnMessageReceivedListener(int messageType,
		OnMessageReceivedListener listener) {
		@NonNull OnMessageReceivedListener listener) {
		final OnMessageReceivedListenerProxy proxy = new OnMessageReceivedListenerProxy(
		null, listener);
		try {

core/java/android/companion/ICompanionDeviceManager.aidl

+5 −0

Original line number	Diff line number	Diff line
		@@ -69,14 +69,19 @@ interface ICompanionDeviceManager {

		void removeOnAssociationsChangedListener(IOnAssociationsChangedListener listener, int userId);

		@EnforcePermission("USE_COMPANION_TRANSPORTS")
		void addOnTransportsChangedListener(IOnTransportsChangedListener listener);

		@EnforcePermission("USE_COMPANION_TRANSPORTS")
		void removeOnTransportsChangedListener(IOnTransportsChangedListener listener);

		@EnforcePermission("USE_COMPANION_TRANSPORTS")
		void sendMessage(int messageType, in byte[] data, in int[] associationIds);

		@EnforcePermission("USE_COMPANION_TRANSPORTS")
		void addOnMessageReceivedListener(int messageType, IOnMessageReceivedListener listener);

		@EnforcePermission("USE_COMPANION_TRANSPORTS")
		void removeOnMessageReceivedListener(int messageType, IOnMessageReceivedListener listener);

		void notifyDeviceAppeared(int associationId);

core/res/AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -5633,6 +5633,12 @@
		android:description="@string/permdesc_deliverCompanionMessages"
		android:protectionLevel="normal" />

		<!-- @hide @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES)
		Allows an application to send and receive messages via CDM transports.
		-->
		<permission android:name="android.permission.USE_COMPANION_TRANSPORTS"
		android:protectionLevel="signature\|module" />

		<!-- Allows an application to create new companion device associations.
		@SystemApi
		@hide -->