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

Merge "Revoke granted permission when the permission defining app is removed." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-10 20:39:08 +00:00
committed by Android (Google) Code Review
parent aa23deba63 bde381848d
commit a2e31e4794
1 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.PermissionWhitelistFlags; import android.content.pm.PackageManager.PermissionWhitelistFlags;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
@@ -2587,7 +2588,7 @@ public class PermissionManagerService {
// Make sure all dynamic permissions have been assigned to a package, // Make sure all dynamic permissions have been assigned to a package,
// and make sure there are no dangling permissions. // and make sure there are no dangling permissions.
flags = updatePermissions(changingPkgName, changingPkg, flags); flags = updatePermissions(changingPkgName, changingPkg, flags, callback);
synchronized (mLock) { synchronized (mLock) {
if (mBackgroundPermissions == null) { if (mBackgroundPermissions == null) {
@@ -2637,7 +2638,8 @@ public class PermissionManagerService {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
} }
private int updatePermissions(String packageName, PackageParser.Package pkg, int flags) { private int updatePermissions(String packageName, PackageParser.Package pkg, int flags,
@Nullable PermissionCallback callback) {
Set<BasePermission> needsUpdate = null; Set<BasePermission> needsUpdate = null;
synchronized (mLock) { synchronized (mLock) {
final Iterator<BasePermission> it = mSettings.mPermissions.values().iterator(); final Iterator<BasePermission> it = mSettings.mPermissions.values().iterator();
@@ -2651,6 +2653,44 @@ public class PermissionManagerService {
&& (pkg == null || !hasPermission(pkg, bp.getName()))) { && (pkg == null || !hasPermission(pkg, bp.getName()))) {
Slog.i(TAG, "Removing old permission tree: " + bp.getName() Slog.i(TAG, "Removing old permission tree: " + bp.getName()
+ " from package " + bp.getSourcePackageName()); + " from package " + bp.getSourcePackageName());
if (bp.isRuntime()) {
final int[] userIds = mUserManagerInt.getUserIds();
final int numUserIds = userIds.length;
for (int userIdNum = 0; userIdNum < numUserIds; userIdNum++) {
final int userId = userIds[userIdNum];
mPackageManagerInt.forEachPackage((Package p) -> {
final String pName = p.packageName;
final ApplicationInfo appInfo =
mPackageManagerInt.getApplicationInfo(pName, 0,
Process.SYSTEM_UID, UserHandle.USER_SYSTEM);
if (appInfo != null
&& appInfo.targetSdkVersion < Build.VERSION_CODES.M) {
return;
}
final String permissionName = bp.getName();
if (checkPermission(permissionName, pName, Process.SYSTEM_UID,
userId) == PackageManager.PERMISSION_GRANTED) {
try {
revokeRuntimePermission(
permissionName,
pName,
false,
userId,
callback);
} catch (IllegalArgumentException e) {
Slog.e(TAG,
"Failed to revoke "
+ permissionName
+ " from "
+ pName,
e);
}
}
});
}
}
flags |= UPDATE_PERMISSIONS_ALL; flags |= UPDATE_PERMISSIONS_ALL;
it.remove(); it.remove();
} }