Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 1639699..dea11e9 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -523,8 +523,6 @@
/** 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;
@@ -4163,11 +4161,6 @@
@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;
@@ -4188,6 +4181,8 @@
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);
}
@@ -4304,8 +4299,7 @@
oldPermissionGroupName, "to", newPermissionGroupName);
try {
- revokeRuntimePermission(packageName, permissionName, userId,
- mSettings.getPermission(permissionName));
+ revokeRuntimePermission(packageName, permissionName, userId);
} catch (IllegalArgumentException e) {
Slog.e(TAG, "Could not revoke " + permissionName + " from "
+ packageName, e);
@@ -9863,10 +9857,7 @@
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);
@@ -9875,10 +9866,6 @@
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) {
@@ -9896,44 +9883,6 @@
}
}
}
-
- 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);
}
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index e534dd9..b0c536f 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -454,17 +454,6 @@
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) {