Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 081b7805 authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

Merge "Address API council feedback" into sc-dev am: 90768407 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1036f74d67ca7fefbb8cd87c2d24f94879dd72fb
parents 64534a4e 90768407

core/java/android/companion/AssociationRequest.java

+4 −0
Original line number Diff line number Diff line
@@ -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 =

core/java/android/permission/PermissionControllerManager.java

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ public final class PermissionControllerManager { 
    public void getPrivilegesDescriptionStringForProfile(

            @NonNull String profileName,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull Consumer<String> callback) {

            @NonNull Consumer<CharSequence> callback) {

        mRemoteService.postAsync(service -> {

            AndroidFuture<String> future = new AndroidFuture<>();

            service.getPrivilegesDescriptionStringForProfile(profileName, future);

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,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);

                        }