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

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

Merge "Remove retainHardAndSoftRestrictedPermissions()."

parents a1cecd71 b3b019b0

services/core/java/com/android/server/pm/PackageInstallerService.java

+0 −5
Original line number Diff line number Diff line
@@ -686,11 +686,6 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
            }

        }



        if (params.whitelistedRestrictedPermissions != null) {

            mPermissionManager.retainHardAndSoftRestrictedPermissions(

                    params.whitelistedRestrictedPermissions);

        }



        final int sessionId;

        final PackageInstallerSession session;

        synchronized (mSessions) {

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

+0 −14
Original line number Diff line number Diff line
@@ -5147,20 +5147,6 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                    true, mDefaultPermissionCallback);

        }



        @Override

        public void retainHardAndSoftRestrictedPermissions(@NonNull List<String> permissionNames) {

            synchronized (mLock) {

                Iterator<String> iterator = permissionNames.iterator();

                while (iterator.hasNext()) {

                    final String permissionName = iterator.next();

                    final Permission permission = mRegistry.getPermission(permissionName);

                    if (permission == null || !permission.isHardOrSoftRestricted()) {

                        iterator.remove();

                    }

                }

            }

        }



        @Override

        public void readLegacyPermissionsTEMP(

                @NonNull LegacyPermissionSettings legacyPermissionSettings) {

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

+0 −6
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ public interface PermissionManagerServiceInternal extends PermissionManagerInter 
    //@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

    void stopShellPermissionIdentityDelegation();



    /**

     * Removes invalid permissions which are not {@link PermissionInfo#FLAG_HARD_RESTRICTED} or

     * {@link PermissionInfo#FLAG_SOFT_RESTRICTED} from the input.

     */

    void retainHardAndSoftRestrictedPermissions(@NonNull List<String> permissionNames);



    /**

     * Read legacy permissions from legacy permission settings.

     *