Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove retainHardAndSoftRestrictedPermissions()."

Browse Source
This commit is contained in:
Hai Zhang
2020-12-07 18:51:01 +00:00
committed by Android (Google) Code Review
parent a1cecd7102 b3b019b050
commit 199f772063
3 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -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) {

14
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -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) {

6
services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java
View File

@@ -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.
*