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

Commit b6e4a313 authored by Hai Zhang's avatar Hai Zhang
Browse files

Expose role API for Settings on RoleManager. 

Settings is a platform app so the role APIs for it wasn't system APIs,
but just @hide. Now that we are moving role into module, we need to
create system APIs for them.

RoleControllerManager is an implementation detail and may change in
soon when we move role logic into system server and leave only UI in
PermissionController, so we shouldn't expose it. Instead, we can
expose the new system APIs on RoleManager, and delegate to
RoleControllerManager internally.

Bug: 158736025
Test: presubmit
Change-Id: I6a3e5a26c3a133e4d1d8fc30a5d8508cd1788202
parent a677335c

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1365,6 +1365,8 @@ package android.app.role { 
    method @NonNull @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public java.util.List<java.lang.String> getHeldRolesFromController(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public java.util.List<java.lang.String> getRoleHolders(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public java.util.List<java.lang.String> getRoleHoldersAsUser(@NonNull String, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void isApplicationVisibleForRole(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void isRoleVisible(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_ROLE_HOLDERS) public void removeOnRoleHoldersChangedListenerAsUser(@NonNull android.app.role.OnRoleHoldersChangedListener, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void removeRoleHolderAsUser(@NonNull String, @NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public boolean removeRoleHolderFromController(@NonNull String, @NonNull String);

core/api/test-current.txt

+0 −5
Original line number Diff line number Diff line
@@ -431,11 +431,6 @@ package android.app.prediction { 


package android.app.role {



  public class RoleControllerManager {

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void isApplicationVisibleForRole(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void isRoleVisible(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

  }



  public final class RoleManager {

    method @Nullable public String getSmsRoleHolder(int);

  }

core/java/android/app/SystemServiceRegistry.java

+0 −9
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.app.contentsuggestions.ContentSuggestionsManager; 
import android.app.contentsuggestions.IContentSuggestionsManager;

import android.app.job.JobSchedulerFrameworkInitializer;

import android.app.prediction.AppPredictionManager;

import android.app.role.RoleControllerManager;

import android.app.role.RoleManager;

import android.app.search.SearchUiManager;

import android.app.slice.SliceManager;
@@ -1291,14 +1290,6 @@ public final class SystemServiceRegistry { 
                        return new RoleManager(ctx.getOuterContext());

                    }});



        registerService(Context.ROLE_CONTROLLER_SERVICE, RoleControllerManager.class,

                new CachedServiceFetcher<RoleControllerManager>() {

                    @Override

                    public RoleControllerManager createService(ContextImpl ctx)

                            throws ServiceNotFoundException {

                        return new RoleControllerManager(ctx.getOuterContext());

                    }});



        registerService(Context.DYNAMIC_SYSTEM_SERVICE, DynamicSystemManager.class,

                new CachedServiceFetcher<DynamicSystemManager>() {

                    @Override

core/java/android/app/role/RoleControllerManager.java

+0 −26
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.Manifest; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.app.ActivityThread;

import android.content.ComponentName;

import android.content.Context;
@@ -48,8 +46,6 @@ import java.util.function.Consumer; 
 *

 * @hide

 */

@SystemService(Context.ROLE_CONTROLLER_SERVICE)

@TestApi

public class RoleControllerManager {



    private static final String LOG_TAG = RoleControllerManager.class.getSimpleName();
@@ -198,33 +194,12 @@ public class RoleControllerManager { 
        propagateCallback(operation, "onClearRoleHolders", callback);

    }



    /**

     * @see RoleControllerService#onIsApplicationQualifiedForRole(String, String)

     *

     * @deprecated Use {@link #isApplicationVisibleForRole(String, String, Executor, Consumer)}

     *             instead.

     *

     * @hide

     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    public void isApplicationQualifiedForRole(@NonNull String roleName, @NonNull String packageName,

            @NonNull @CallbackExecutor Executor executor, @NonNull Consumer<Boolean> callback) {

        AndroidFuture<Bundle> operation = mRemoteService.postAsync(service -> {

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

            service.isApplicationQualifiedForRole(roleName, packageName,

                    new RemoteCallback(future::complete));

            return future;

        });

        propagateCallback(operation, "isApplicationQualifiedForRole", executor, callback);

    }



    /**

     * @see RoleControllerService#onIsApplicationVisibleForRole(String, String)

     *

     * @hide

     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @TestApi

    public void isApplicationVisibleForRole(@NonNull String roleName, @NonNull String packageName,

            @NonNull @CallbackExecutor Executor executor, @NonNull Consumer<Boolean> callback) {

        AndroidFuture<Bundle> operation = mRemoteService.postAsync(service -> {
@@ -242,7 +217,6 @@ public class RoleControllerManager { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @TestApi

    public void isRoleVisible(@NonNull String roleName,

            @NonNull @CallbackExecutor Executor executor, @NonNull Consumer<Boolean> callback) {

        AndroidFuture<Bundle> operation = mRemoteService.postAsync(service -> {

core/java/android/app/role/RoleManager.java

+42 −0
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ public final class RoleManager { 
    @NonNull

    private final Object mListenersLock = new Object();



    @NonNull

    private final RoleControllerManager mRoleControllerManager;



    /**

     * @hide

     */
@@ -181,6 +184,7 @@ public final class RoleManager { 
        mContext = context;

        mService = IRoleManager.Stub.asInterface(ServiceManager.getServiceOrThrow(

                Context.ROLE_SERVICE));

        mRoleControllerManager = new RoleControllerManager(context);

    }



    /**
@@ -676,6 +680,44 @@ public final class RoleManager { 
        }

    }



    /**

     * Check whether a role should be visible to user.

     *

     * @param roleName name of the role to check for

     * @param executor the executor to execute callback on

     * @param callback the callback to receive whether the role should be visible to user

     *

     * @hide

     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    public void isRoleVisible(@NonNull String roleName,

            @NonNull @CallbackExecutor Executor executor, @NonNull Consumer<Boolean> callback) {

        mRoleControllerManager.isRoleVisible(roleName, executor, callback);

    }



    /**

     * Check whether an application is visible for a role.

     *

     * While an application can be qualified for a role, it can still stay hidden from user (thus

     * not visible). If an application is visible for a role, we may show things related to the role

     * for it, e.g. showing an entry pointing to the role settings in its application info page.

     *

     * @param roleName the name of the role to check for

     * @param packageName the package name of the application to check for

     * @param executor the executor to execute callback on

     * @param callback the callback to receive whether the application is visible for the role

     *

     * @hide

     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    public void isApplicationVisibleForRole(@NonNull String roleName, @NonNull String packageName,

            @NonNull @CallbackExecutor Executor executor, @NonNull Consumer<Boolean> callback) {

        mRoleControllerManager.isApplicationVisibleForRole(roleName, packageName, executor,

                callback);

    }



    private static class OnRoleHoldersChangedListenerDelegate

            extends IOnRoleHoldersChangedListener.Stub {