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

Commit bc054d84 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Rename RuntimePermissionPresenter to PermissionController 

As this has already evolved from just presenting data. In the future any
permission related calls to the permission controller will be added here.

As the calls are protected by different permissions the binding will not
require a permission anymore, but each individual call checks the
permission.

Bug: 120221960
Test: Looked at settings UI showing data from this interface
Change-Id: I6b4a5c3b7ee17b145e11e2c1b6e11a8a232bffed
parent c54ffd28

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ java_defaults { 
        "core/java/android/os/storage/IStorageEventListener.aidl",

        "core/java/android/os/storage/IStorageShutdownObserver.aidl",

        "core/java/android/os/storage/IObbActionListener.aidl",

        "core/java/android/permission/IRuntimePermissionPresenter.aidl",

        "core/java/android/permission/IPermissionController.aidl",

        "core/java/android/rolecontrollerservice/IRoleControllerService.aidl",

        ":keystore_aidl",

        "core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl",

api/system-current.txt

+11 −10
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ package android { 
    field public static final java.lang.String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";

    field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";

    field public static final java.lang.String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE";

    field public static final java.lang.String GET_RUNTIME_PERMISSIONS = "android.permission.GET_RUNTIME_PERMISSIONS";

    field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO";

    field public static final java.lang.String GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS = "android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS";

    field public static final java.lang.String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS";
@@ -4655,6 +4656,16 @@ package android.os.storage { 


package android.permission {



  public abstract class PermissionControllerService extends android.app.Service {

    ctor public PermissionControllerService();

    method public final void attachBaseContext(android.content.Context);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract int onCountPermissionApps(java.util.List<java.lang.String>, boolean, boolean);

    method public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(java.lang.String);

    method public abstract void onRevokeRuntimePermission(java.lang.String, java.lang.String);

    field public static final java.lang.String SERVICE_INTERFACE = "android.permission.PermissionControllerService";

  }



  public final class PermissionManager {

    method public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions();

  }
@@ -4675,16 +4686,6 @@ package android.permission { 
    field public static final android.os.Parcelable.Creator<android.permission.RuntimePermissionPresentationInfo> CREATOR;

  }



  public abstract class RuntimePermissionPresenterService extends android.app.Service {

    ctor public RuntimePermissionPresenterService();

    method public final void attachBaseContext(android.content.Context);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract int onCountPermissionApps(java.util.List<java.lang.String>, boolean, boolean);

    method public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(java.lang.String);

    method public abstract void onRevokeRuntimePermission(java.lang.String, java.lang.String);

    field public static final java.lang.String SERVICE_INTERFACE = "android.permission.RuntimePermissionPresenterService";

  }



}



package android.permissionpresenterservice {

core/java/android/app/SystemServiceRegistry.java

+8 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ import android.os.UserManager; 
import android.os.Vibrator;

import android.os.health.SystemHealthManager;

import android.os.storage.StorageManager;

import android.permission.PermissionControllerManager;

import android.permission.PermissionManager;

import android.print.IPrintManager;

import android.print.PrintManager;
@@ -1164,6 +1165,13 @@ final class SystemServiceRegistry { 
                        return new PermissionManager(ctx.getOuterContext());

                    }});



        registerService(Context.PERMISSION_CONTROLLER_SERVICE, PermissionControllerManager.class,

                new CachedServiceFetcher<PermissionControllerManager>() {

                    @Override

                    public PermissionControllerManager createService(ContextImpl ctx) {

                        return new PermissionControllerManager(ctx.getOuterContext());

                    }});



        registerService(Context.ROLE_SERVICE, RoleManager.class,

                new CachedServiceFetcher<RoleManager>() {

                    @Override

core/java/android/content/Context.java

+8 −0
Original line number Diff line number Diff line
@@ -3992,6 +3992,14 @@ public abstract class Context { 
    @SystemApi

    public static final String PERMISSION_SERVICE = "permission";



    /**

     * Official published name of the (internal) permission controller service.

     *

     * @see #getSystemService(String)

     * @hide

     */

    public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller";



    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * {@link android.app.backup.IBackupManager IBackupManager} for communicating

core/java/android/permission/IRuntimePermissionPresenter.aidl→core/java/android/permission/IPermissionController.aidl

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ package android.permission; 
import android.os.RemoteCallback;



/**

 * Interface for communication with the permission presenter service.

 * Interface for system apps to communication with the permission controller.

 *

 * @hide

 */

oneway interface IRuntimePermissionPresenter {

oneway interface IPermissionController {

    void getAppPermissions(String packageName, in RemoteCallback callback);

    void revokeRuntimePermission(String packageName, String permissionName);

    void countPermissionApps(in List<String> permissionNames, boolean countOnlyGranted,