From 206e26a294244078efc5b0cb648410934187b61a Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Tue, 2 Mar 2021 12:25:10 -0800 Subject: [PATCH] Address API council feedback Fixes: 181681395 Fixes: 181562406 Test: presubmit Change-Id: I51fc6e1568a8fadf82c8c1c5b52c1356a94ce36d --- core/java/android/companion/AssociationRequest.java | 4 ++++ core/java/android/permission/PermissionControllerManager.java | 2 +- .../server/companion/CompanionDeviceManagerService.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/companion/AssociationRequest.java b/core/java/android/companion/AssociationRequest.java index 102c98ff9329c..17bdd42a0f458 100644 --- a/core/java/android/companion/AssociationRequest.java +++ b/core/java/android/companion/AssociationRequest.java @@ -60,6 +60,10 @@ public final class AssociationRequest implements Parcelable { /** * Device profile: watch. * + * If specified, the current request may have a modified UI to highlight that the device being + * set up is a specific kind of device, and some extra permissions may be granted to the app + * as a result. + * * @see AssociationRequest.Builder#setDeviceProfile */ public static final String DEVICE_PROFILE_WATCH = diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java index 084b18eb29991..913b827332bf4 100644 --- a/core/java/android/permission/PermissionControllerManager.java +++ b/core/java/android/permission/PermissionControllerManager.java @@ -668,7 +668,7 @@ public final class PermissionControllerManager { public void getPrivilegesDescriptionStringForProfile( @NonNull String profileName, @NonNull @CallbackExecutor Executor executor, - @NonNull Consumer callback) { + @NonNull Consumer callback) { mRemoteService.postAsync(service -> { AndroidFuture future = new AndroidFuture<>(); service.getPrivilegesDescriptionStringForProfile(profileName, future); diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 21cae453d702f..a3a0cb402c761 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -1330,7 +1330,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind mPermissionControllerManager.getPrivilegesDescriptionStringForProfile( deviceProfile, FgThread.getExecutor(), desc -> { try { - result.complete(desc); + result.complete(String.valueOf(desc)); } catch (Exception e) { result.completeExceptionally(e); }