diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 4cee2e58d20e9..34bee9572753d 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -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) { diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 791efd022fe9b..389010ae97349 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -5147,20 +5147,6 @@ public class PermissionManagerService extends IPermissionManager.Stub { true, mDefaultPermissionCallback); } - @Override - public void retainHardAndSoftRestrictedPermissions(@NonNull List permissionNames) { - synchronized (mLock) { - Iterator 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) { diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java index 66e692db2154e..0817d4fc895ea 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java @@ -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 permissionNames); - /** * Read legacy permissions from legacy permission settings. *