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

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

Finish swapping packageName and permissionName. 

Package is the subject and permission is the attribute, so naturally
package should come first. However, some APIs in the early days
weren't declared this way. Now that our new APIs are designed
properly, clean up our ordering internally as well.

Bug: 158736025
Test: presubmit
Change-Id: I47cab14bb80afcdb7e868fe75a375a4705606d9d
parent 3d18402f

core/java/android/permission/IPermissionManager.aidl

+11 −10
Original line number Diff line number Diff line
@@ -33,17 +33,17 @@ interface IPermissionManager { 


    PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags);



    PermissionInfo getPermissionInfo(String permName, String packageName, int flags);

    PermissionInfo getPermissionInfo(String permissionName, String packageName, int flags);



    ParceledListSlice queryPermissionsByGroup(String groupName, int flags);



    boolean addPermission(in PermissionInfo info, boolean async);

    boolean addPermission(in PermissionInfo permissionInfo, boolean async);



    void removePermission(String name);

    void removePermission(String permissionName);



    int getPermissionFlags(String permName, String packageName, int userId);

    int getPermissionFlags(String packageName, String permissionName, int userId);



    void updatePermissionFlags(String permName, String packageName, int flagMask,

    void updatePermissionFlags(String packageName, String permissionName, int flagMask,

            int flagValues, boolean checkAdjustPolicyFlagPermission, int userId);



    void updatePermissionFlagsForAllApps(int flagMask, int flagValues, int userId);
@@ -61,14 +61,15 @@ interface IPermissionManager { 
    boolean removeAllowlistedRestrictedPermission(String packageName, String permissionName,

            int flags, int userId);



    void grantRuntimePermission(String packageName, String permName, int userId);

    void grantRuntimePermission(String packageName, String permissionName, int userId);



    void revokeRuntimePermission(String packageName, String permName, int userId, String reason);

    void revokeRuntimePermission(String packageName, String permissionName, int userId,

            String reason);



    boolean shouldShowRequestPermissionRationale(String permName,

            String packageName, int userId);

    boolean shouldShowRequestPermissionRationale(String packageName, String permissionName,

            int userId);



    boolean isPermissionRevokedByPolicy(String permName, String packageName, int userId);

    boolean isPermissionRevokedByPolicy(String packageName, String permissionName, int userId);



    List<SplitPermissionInfoParcelable> getSplitPermissions();

core/java/android/permission/PermissionManager.java

+6 −6
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ public final class PermissionManager { 
    public boolean isPermissionRevokedByPolicy(@NonNull String packageName,

            @NonNull String permissionName) {

        try {

            return mPermissionManager.isPermissionRevokedByPolicy(permissionName, packageName,

            return mPermissionManager.isPermissionRevokedByPolicy(packageName, permissionName,

                    mContext.getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -332,7 +332,7 @@ public final class PermissionManager { 
     * @param permissionName the permission name to grant

     * @param user the user for which to grant the permission

     *

     * @see #revokeRuntimePermission(String, String, android.os.UserHandle)

     * @see #revokeRuntimePermission(String, String, android.os.UserHandle, String)

     *

     * @hide

     */
@@ -411,7 +411,7 @@ public final class PermissionManager { 
    public int getPermissionFlags(@NonNull String packageName, @NonNull String permissionName,

            @NonNull UserHandle user) {

        try {

            return mPermissionManager.getPermissionFlags(permissionName, packageName,

            return mPermissionManager.getPermissionFlags(packageName, permissionName,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -450,7 +450,7 @@ public final class PermissionManager { 
        try {

            final boolean checkAdjustPolicyFlagPermission =

                    mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.Q;

            mPermissionManager.updatePermissionFlags(permissionName, packageName, flagMask,

            mPermissionManager.updatePermissionFlags(packageName, permissionName, flagMask,

                    flagValues, checkAdjustPolicyFlagPermission, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -721,8 +721,8 @@ public final class PermissionManager { 
    public boolean shouldShowRequestPermissionRationale(@NonNull String permissionName) {

        try {

            final String packageName = mContext.getPackageName();

            return mPermissionManager.shouldShowRequestPermissionRationale(permissionName,

                    packageName, mContext.getUserId());

            return mPermissionManager.shouldShowRequestPermissionRationale(packageName,

                    permissionName, mContext.getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+60 −63

File changed.

Preview size limit exceeded, changes collapsed.