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

Commit 6d43f332 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add ModernPermissionManagerServiceImpl skeleton and two methods."

parents 6621b2b5 6faa4aaa

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

+3 −3
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 


    @Override

    public PermissionInfo getPermissionInfo(String permissionName, String packageName, int flags) {

        return mPermissionManagerServiceImpl.getPermissionInfo(permissionName, packageName, flags);

        return mPermissionManagerServiceImpl.getPermissionInfo(permissionName, flags, packageName);

    }



    @Override
@@ -792,14 +792,14 @@ public class PermissionManagerService extends IPermissionManager.Stub { 


        @NonNull

        @Override

        public ArrayList<PermissionInfo> getAllPermissionsWithProtection(

        public List<PermissionInfo> getAllPermissionsWithProtection(

                @PermissionInfo.Protection int protection) {

            return mPermissionManagerServiceImpl.getAllPermissionsWithProtection(protection);

        }



        @NonNull

        @Override

        public ArrayList<PermissionInfo> getAllPermissionsWithProtectionFlags(

        public List<PermissionInfo> getAllPermissionsWithProtectionFlags(

                @PermissionInfo.ProtectionFlags int protectionFlags) {

            return mPermissionManagerServiceImpl

                    .getAllPermissionsWithProtectionFlags(protectionFlags);

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

+7 −7
Original line number Diff line number Diff line
@@ -559,8 +559,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 


    @Override

    @Nullable

    public PermissionInfo getPermissionInfo(@NonNull String permName, @NonNull String opPackageName,

            @PackageManager.PermissionInfoFlags int flags) {

    public PermissionInfo getPermissionInfo(@NonNull String permName,

            @PackageManager.PermissionInfoFlags int flags, @NonNull String opPackageName) {

        final int callingUid = Binder.getCallingUid();

        if (mPackageManagerInt.getInstantAppPackageName(callingUid) != null) {

            return null;
@@ -2127,7 +2127,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
            for (int i = 0; i < numRequestedPermissions; i++) {

                PermissionInfo permInfo = getPermissionInfo(

                        newPackage.getRequestedPermissions().get(i),

                        newPackage.getPackageName(), 0);

                        0, newPackage.getPackageName());

                if (permInfo == null) {

                    continue;

                }
@@ -5204,9 +5204,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 


    @NonNull

    @Override

    public ArrayList<PermissionInfo> getAllPermissionsWithProtection(

    public List<PermissionInfo> getAllPermissionsWithProtection(

            @PermissionInfo.Protection int protection) {

        ArrayList<PermissionInfo> matchingPermissions = new ArrayList<>();

        List<PermissionInfo> matchingPermissions = new ArrayList<>();



        synchronized (mLock) {

            for (final Permission permission : mRegistry.getPermissions()) {
@@ -5221,9 +5221,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 


    @NonNull

    @Override

    public ArrayList<PermissionInfo> getAllPermissionsWithProtectionFlags(

    public List<PermissionInfo> getAllPermissionsWithProtectionFlags(

            @PermissionInfo.ProtectionFlags int protectionFlags) {

        ArrayList<PermissionInfo> matchingPermissions = new ArrayList<>();

        List<PermissionInfo> matchingPermissions = new ArrayList<>();



        synchronized (mLock) {

            for (final Permission permission : mRegistry.getPermissions()) {

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

+4 −5
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.server.pm.pkg.AndroidPackage; 


import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.Set;
@@ -77,8 +76,8 @@ public interface PermissionManagerServiceInterface extends PermissionManagerInte 
     * @return a {@link PermissionInfo} containing information about the permission, or {@code null}

     *         if not found

     */

    PermissionInfo getPermissionInfo(@NonNull String permName, @NonNull String opPackageName,

            @PackageManager.PermissionInfoFlags int flags);

    PermissionInfo getPermissionInfo(@NonNull String permName,

            @PackageManager.PermissionInfoFlags int flags, @NonNull String opPackageName);



    /**

     * Query for all of the permissions associated with a particular group.
@@ -487,11 +486,11 @@ public interface PermissionManagerServiceInterface extends PermissionManagerInte 


    /** Get all permissions that have a certain protection */

    @NonNull

    ArrayList<PermissionInfo> getAllPermissionsWithProtection(

    List<PermissionInfo> getAllPermissionsWithProtection(

            @PermissionInfo.Protection int protection);



    /** Get all permissions that have certain protection flags */

    @NonNull ArrayList<PermissionInfo> getAllPermissionsWithProtectionFlags(

    @NonNull List<PermissionInfo> getAllPermissionsWithProtectionFlags(

            @PermissionInfo.ProtectionFlags int protectionFlags);



    /**

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

+4 −3
Original line number Diff line number Diff line
@@ -164,11 +164,12 @@ public interface PermissionManagerServiceInternal extends PermissionManagerInter 


    /** Get all permissions that have a certain protection */

    @NonNull

    ArrayList<PermissionInfo> getAllPermissionsWithProtection(

    List<PermissionInfo> getAllPermissionsWithProtection(

            @PermissionInfo.Protection int protection);



    /** Get all permissions that have certain protection flags */

    @NonNull ArrayList<PermissionInfo> getAllPermissionsWithProtectionFlags(

    /** Get all permissions that have certain protection flags

     * @return*/

    @NonNull List<PermissionInfo> getAllPermissionsWithProtectionFlags(

            @PermissionInfo.ProtectionFlags int protectionFlags);



    /**

services/core/java/com/android/server/policy/PermissionPolicyService.java

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public final class PermissionPolicyService extends SystemService { 
            }

        };



        final ArrayList<PermissionInfo> dangerousPerms =

        final List<PermissionInfo> dangerousPerms =

                mPermissionManagerInternal.getAllPermissionsWithProtection(

                        PermissionInfo.PROTECTION_DANGEROUS);

        try {