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

[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815 am: 9310c5bdd3

Browse Source 
Change-Id: I83e62233a15ffa1a02ac62e7d1323d342876756f
This commit is contained in:
Android Build Merger (Role)
2018-07-19 21:29:33 +00:00
parent d6143e9307 9310c5bdd3
commit c565a7f7e2
2 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -523,6 +523,8 @@ public class PackageManagerService extends IPackageManager.Stub {
/** Special library name that skips shared libraries check during compilation. */
private static final String SKIP_SHARED_LIBRARY_CHECK = "&";
private static final int PROTECTION_MASK_BASE = 0xf;
final ServiceThread mHandlerThread;
final PackageHandler mHandler;
@@ -4152,6 +4154,11 @@ public class PackageManagerService extends IPackageManager.Stub {
@Override
public void revokeRuntimePermission(String packageName, String name, int userId) {
revokeRuntimePermission(packageName, name, userId, mSettings.getPermission(name));
}
private void revokeRuntimePermission(String packageName, String name, int userId,
BasePermission bp) {
if (!sUserManager.exists(userId)) {
Log.e(TAG, "No such user:" + userId);
return;
@@ -4172,8 +4179,6 @@ public class PackageManagerService extends IPackageManager.Stub {
if (pkg == null) {
throw new IllegalArgumentException("Unknown package: " + packageName);
}
final BasePermission bp = mSettings.mPermissions.get(name);
if (bp == null) {
throw new IllegalArgumentException("Unknown permission: " + name);
}
@@ -4290,7 +4295,8 @@ public class PackageManagerService extends IPackageManager.Stub {
oldPermissionGroupName, "to", newPermissionGroupName);
try {
revokeRuntimePermission(packageName, permissionName, userId);
revokeRuntimePermission(packageName, permissionName, userId,
mSettings.getPermission(permissionName));
} catch (IllegalArgumentException e) {
Slog.e(TAG, "Could not revoke " + permissionName + " from "
+ packageName, e);
@@ -9856,7 +9862,10 @@ public class PackageManagerService extends IPackageManager.Stub {
if (DEBUG_REMOVE) Log.d(TAG, " Activities: " + r);
}
final ArrayList<String> allPackageNames = new ArrayList<>(mPackages.keySet());
N = pkg.permissions.size();
List<BasePermission> bps = new ArrayList<BasePermission>(N);
r = null;
for (i=0; i<N; i++) {
PackageParser.Permission p = pkg.permissions.get(i);
@@ -9865,6 +9874,10 @@ public class PackageManagerService extends IPackageManager.Stub {
bp = mSettings.mPermissionTrees.get(p.info.name);
}
if (bp != null && bp.perm == p) {
if (((p.info.protectionLevel & PROTECTION_MASK_BASE) &
PermissionInfo.PROTECTION_DANGEROUS) != 0) {
bps.add(bp);
}
bp.perm = null;
if (DEBUG_REMOVE && chatty) {
if (r == null) {
@@ -9882,6 +9895,44 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
}
AsyncTask.execute(() -> {
final int numRemovedPermissions = bps.size();
for (int permissionNum = 0; permissionNum < numRemovedPermissions; permissionNum++) {
final int[] userIds = sUserManager.getUserIds();
final int numUserIds = userIds.length;
final int numPackages = allPackageNames.size();
for (int packageNum = 0; packageNum < numPackages; packageNum++) {
final String packageName = allPackageNames.get(packageNum);
final PackageManagerInternal packageManagerInt =
LocalServices.getService(PackageManagerInternal.class);
final ApplicationInfo applicationInfo = packageManagerInt.getApplicationInfo(
packageName, UserHandle.USER_SYSTEM);
if (applicationInfo != null
&& applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
continue;
}
for (int userIdNum = 0; userIdNum < numUserIds; userIdNum++) {
final int userId = userIds[userIdNum];
final String permissionName = bps.get(permissionNum).name;
if (checkPermission(permissionName, packageName,
userId) == PackageManager.PERMISSION_GRANTED) {
try {
revokeRuntimePermission(packageName,
permissionName,
userId,
bps.get(permissionNum));
} catch (IllegalArgumentException e) {
Slog.e(TAG, "Could not revoke " + permissionName + " from "
+ packageName, e);
}
}
}
}
}
});
if (r != null) {
if (DEBUG_REMOVE) Log.d(TAG, " Permissions: " + r);
}

11
services/core/java/com/android/server/pm/Settings.java
View File

@@ -454,6 +454,17 @@ final class Settings {
return mPackages.get(name);
}
public BasePermission getPermission(@NonNull String permName) {
synchronized (mLock) {
return getPermissionLocked(permName);
}
}
@GuardedBy("mLock")
BasePermission getPermissionLocked(@NonNull String permName) {
return mPermissions.get(permName);
}
void setInstallStatus(String pkgName, final int status) {
PackageSetting p = mPackages.get(pkgName);
if(p != null) {