Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add CDM data transfer interfaces

Browse Source 
Design: go/cdm-data-transfer-dd

Fix: 198485833

Test: N/A
Change-Id: I37fd8b84ceea671e76332042761d3f99f7090b98
This commit is contained in:
Guojing Yuan
2021-09-01 21:45:33 +00:00
parent b61c3bb7e8
commit 6aea80689d
7 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/current.txt
View File

@@ -79,6 +79,7 @@ package android {
field public static final String CONTROL_LOCATION_UPDATES = "android.permission.CONTROL_LOCATION_UPDATES";
field public static final String DELETE_CACHE_FILES = "android.permission.DELETE_CACHE_FILES";
field public static final String DELETE_PACKAGES = "android.permission.DELETE_PACKAGES";
field public static final String DELIVER_COMPANION_MESSAGES = "android.permission.DELIVER_COMPANION_MESSAGES";
field public static final String DIAGNOSTIC = "android.permission.DIAGNOSTIC";
field public static final String DISABLE_KEYGUARD = "android.permission.DISABLE_KEYGUARD";
field public static final String DUMP = "android.permission.DUMP";
@@ -9885,6 +9886,8 @@ package android.companion {
method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
method @MainThread public abstract void onDeviceAppeared(@NonNull String);
method @MainThread public abstract void onDeviceDisappeared(@NonNull String);
method @MainThread public void onSendMessage(int, int, @NonNull byte[]);
method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void receiveMessage(int, int, @NonNull byte[]);
field public static final String SERVICE_INTERFACE = "android.companion.CompanionDeviceService";
}

29
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -444,6 +444,35 @@ public final class CompanionDeviceManager {
}
}
/**
* Dispatch received message to system for processing.
*
* <p>Messages received from {@link CompanionDeviceService#onSendMessage}, which is implemented
* on another device, need to be dispatched to system for processing.</p>
*
* <p>Calling app must declare uses-permission
* {@link android.Manifest.permission#DELIVER_COMPANION_MESSAGES}</p>
*
* @param messageId id of the message
* @param associationId association id of the associated device where data is coming from
* @param message message received from the associated device
*
* @throws DeviceNotAssociatedException if the given device was not previously associated with
* this app
*
* @hide
*/
@RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES)
public void receiveMessage(int messageId, int associationId, @NonNull byte[] message)
throws DeviceNotAssociatedException {
try {
mService.receiveMessage(messageId, associationId, message);
} catch (RemoteException e) {
ExceptionUtils.propagateIfInstanceOf(e.getCause(), DeviceNotAssociatedException.class);
throw e.rethrowFromSystemServer();
}
}
/**
* Associates given device with given app for the given user directly, without UI prompt.
*

44
core/java/android/companion/CompanionDeviceService.java
View File

@@ -20,6 +20,7 @@ package android.companion;
import android.annotation.MainThread;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.app.Service;
import android.content.Intent;
import android.os.Handler;
@@ -86,6 +87,36 @@ public abstract class CompanionDeviceService extends Service {
@MainThread
public abstract void onDeviceDisappeared(@NonNull String address);
/**
* Called by system whenever the system tries to send a message to an associated device.
*
* @param messageId system assigned id of the message to be sent
* @param associationId association id of the associated device
* @param message message to be sent
*/
@MainThread
public void onSendMessage(int messageId, int associationId, @NonNull byte[] message) {
// do nothing. Companion apps can override this function for system to send messages.
}
/**
* Called when there's message received from an associated device, which needs to be dispatched
* to system for processing.
*
* <p>Calling app must declare uses-permission
* {@link android.Manifest.permission#DELIVER_COMPANION_MESSAGES}</p>
*
* @param messageId id of the message
* @param associationId id of the associated device
* @param message messaged received from the associated device
*/
@RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES)
public final void receiveMessage(int messageId, int associationId, @NonNull byte[] message) {
CompanionDeviceManager companionDeviceManager =
getSystemService(CompanionDeviceManager.class);
companionDeviceManager.receiveMessage(messageId, associationId, message);
}
@Nullable
@Override
public final IBinder onBind(@NonNull Intent intent) {
@@ -112,5 +143,18 @@ public abstract class CompanionDeviceService extends Service {
CompanionDeviceService::onDeviceDisappeared,
CompanionDeviceService.this, address));
}
public void onSendMessage(int messageId, int associationId, @NonNull byte[] message) {
Handler.getMain().sendMessage(PooledLambda.obtainMessage(
CompanionDeviceService::onSendMessage,
CompanionDeviceService.this, messageId, associationId, message));
}
public final void receiveMessage(int messageId, int associationId,
@NonNull byte[] message) {
Handler.getMain().sendMessage(PooledLambda.obtainMessage(
CompanionDeviceService::receiveMessage,
CompanionDeviceService.this, messageId, associationId, message));
}
}
}

2
core/java/android/companion/ICompanionDeviceManager.aidl
View File

@@ -54,4 +54,6 @@ interface ICompanionDeviceManager {
void createAssociation(in String packageName, in String macAddress, int userId,
in byte[] certificate);
void receiveMessage(in int messageId, in int associationId, in byte[] message);
}

7
core/java/android/companion/ICompanionDeviceService.aidl
View File

@@ -16,14 +16,9 @@
package android.companion;
import android.app.PendingIntent;
import android.companion.IFindDeviceCallback;
import android.companion.Association;
import android.companion.AssociationRequest;
import android.content.ComponentName;
/** @hide */
oneway interface ICompanionDeviceService {
void onDeviceAppeared(in String address);
void onDeviceDisappeared(in String address);
void onSendMessage(in int messageId, in int associationId, in byte[] message);
}

5
core/res/AndroidManifest.xml
View File

@@ -4331,6 +4331,11 @@
<permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE"
android:protectionLevel="normal" />
<!-- Allows an application to deliver companion messages to system
-->
<permission android:name="android.permission.DELIVER_COMPANION_MESSAGES"
android:protectionLevel="normal" />
<!-- Allows an application to create new companion device associations.
@SystemApi
@hide -->

8
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -98,8 +98,6 @@ import android.os.ShellCommand;
import android.os.UserHandle;
import android.os.UserManager;
import android.permission.PermissionControllerManager;
import android.provider.Settings;
import android.provider.SettingsStringUtil.ComponentNameSet;
import android.text.BidiFormatter;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -629,6 +627,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
registerDevicePresenceListenerActive(packageName, deviceAddress, false);
}
@Override
public void receiveMessage(int messageId, int associationId, byte[] message)
throws RemoteException {
//TODO: b/199427116
}
private void registerDevicePresenceListenerActive(String packageName, String deviceAddress,
boolean active) throws RemoteException {
getContext().enforceCallingOrSelfPermission(