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

Merge "Update associate API by adding certificate param" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-24 21:00:17 +00:00
committed by Android (Google) Code Review
parent 4fab561f27 cc4ffc849b
commit 06cd94a6de
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -2246,7 +2246,7 @@ package android.bluetooth.le {
package android.companion { package android.companion {
public final class CompanionDeviceManager { public final class CompanionDeviceManager {
method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public void associate(@NonNull String, @NonNull android.net.MacAddress); method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public void associate(@NonNull String, @NonNull android.net.MacAddress, @NonNull byte[]);
method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean canPairWithoutPrompt(@NonNull String, @NonNull String, @NonNull android.os.UserHandle); method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean canPairWithoutPrompt(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);
method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle); method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle);
} }

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

@@ -442,13 +442,18 @@ public final class CompanionDeviceManager {
/** /**
* Associates given device with given app for the given user directly, without UI prompt. * Associates given device with given app for the given user directly, without UI prompt.
* *
* @param packageName package name of the companion app
* @param macAddress mac address of the device to associate
* @param certificate The SHA256 digest of the companion app's signing certificate
*
* @hide * @hide
*/ */
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES)
public void associate( public void associate(
@NonNull String packageName, @NonNull String packageName,
@NonNull MacAddress macAddress) { @NonNull MacAddress macAddress,
@NonNull byte[] certificate) {
if (!checkFeaturePresent()) { if (!checkFeaturePresent()) {
return; return;
} }
@@ -458,7 +463,7 @@ public final class CompanionDeviceManager {
UserHandle user = android.os.Process.myUserHandle(); UserHandle user = android.os.Process.myUserHandle();
try { try {
mService.createAssociation( mService.createAssociation(
packageName, macAddress.toString(), user.getIdentifier()); packageName, macAddress.toString(), user.getIdentifier(), certificate);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

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

@@ -52,5 +52,6 @@ interface ICompanionDeviceManager {
boolean canPairWithoutPrompt(in String packageName, in String deviceMacAddress, int userId); boolean canPairWithoutPrompt(in String packageName, in String deviceMacAddress, int userId);
void createAssociation(in String packageName, in String macAddress, int userId); void createAssociation(in String packageName, in String macAddress, int userId,
in byte[] certificate);
} }

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

@@ -20,6 +20,7 @@ package com.android.server.companion;
import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_ALL_MATCHES; import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_ALL_MATCHES;
import static android.bluetooth.le.ScanSettings.SCAN_MODE_BALANCED; import static android.bluetooth.le.ScanSettings.SCAN_MODE_BALANCED;
import static android.content.Context.BIND_IMPORTANT; import static android.content.Context.BIND_IMPORTANT;
import static android.content.pm.PackageManager.CERT_INPUT_SHA256;
import static android.content.pm.PackageManager.MATCH_ALL; import static android.content.pm.PackageManager.MATCH_ALL;
import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -657,7 +658,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
@Override @Override
public void createAssociation(String packageName, String macAddress, int userId) { public void createAssociation(String packageName, String macAddress, int userId,
byte[] certificate) {
if (!getContext().getPackageManager().hasSigningCertificate(
packageName, certificate, CERT_INPUT_SHA256)) {
Slog.e(LOG_TAG, "Given certificate doesn't match the package certificate.");
return;
}
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES, "createAssociation"); android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES, "createAssociation");