diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-30 04:24:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-30 04:24:36 +0000 |
commit | 854b000af20882311b55ba71988e4a8856f60023 (patch) | |
tree | bb9cb164c3f5dca771ce4121b0ce821c740eb4b8 | |
parent | 841930e168bb956c79fd1aaedf0229e05f98fd5e (diff) | |
parent | c7d576e2e96e35d694a2a75a8bd5201cabaf61b9 (diff) | |
download | base-854b000af20882311b55ba71988e4a8856f60023.tar.gz |
Merge cherrypicks of [4902694, 4902725, 4902587, 4902588, 4902761, 4902762] into pi-release-2android-9.0.0_r10pie-release-2
Change-Id: Iba0646b31a09b08d22c0dd9ff83dd9ee57fdc821
3 files changed, 13 insertions, 79 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 6286a242dba2..9ed2b9c18546 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -12344,8 +12344,7 @@ public class PackageManagerService extends IPackageManager.Stub if (DEBUG_REMOVE) Log.d(TAG, " Activities: " + r); } - final ArrayList<String> allPackageNames = new ArrayList<>(mPackages.keySet()); - mPermissionManager.removeAllPermissions(pkg, allPackageNames, mPermissionCallback, chatty); + mPermissionManager.removeAllPermissions(pkg, chatty); N = pkg.instrumentation.size(); r = null; diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerInternal.java b/services/core/java/com/android/server/pm/permission/PermissionManagerInternal.java index c3f23a81518a..a042fedf8b47 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerInternal.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerInternal.java @@ -115,11 +115,7 @@ public abstract class PermissionManagerInternal { */ public abstract void addAllPermissions(@NonNull PackageParser.Package pkg, boolean chatty); public abstract void addAllPermissionGroups(@NonNull PackageParser.Package pkg, boolean chatty); - public abstract void removeAllPermissions( - @NonNull PackageParser.Package pkg, - @NonNull List<String> allPackageNames, - @Nullable PermissionCallback permissionCallback, - boolean chatty); + public abstract void removeAllPermissions(@NonNull PackageParser.Package pkg, boolean chatty); public abstract boolean addDynamicPermission(@NonNull PermissionInfo info, boolean async, int callingUid, @Nullable PermissionCallback callback); public abstract void removeDynamicPermission(@NonNull String permName, int callingUid, @@ -193,4 +189,4 @@ public abstract class PermissionManagerInternal { /** HACK HACK methods to allow for partial migration of data to the PermissionManager class */ public abstract @Nullable BasePermission getPermissionTEMP(@NonNull String permName); -} +}
\ No newline at end of file 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 02c9049f008e..c51a72406b53 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -30,7 +30,6 @@ import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.content.pm.PackageParser; @@ -38,7 +37,6 @@ import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; import android.content.pm.PackageParser.Package; import android.metrics.LogMaker; -import android.os.AsyncTask; import android.os.Binder; import android.os.Build; import android.os.Handler; @@ -457,9 +455,8 @@ public class PermissionManagerService { " to " + newPermissionGroupName); try { - revokeRuntimePermission(permissionName, packageName, - mSettings.getPermission(permissionName), false, - Process.SYSTEM_UID, userId, permissionCallback, false); + revokeRuntimePermission(permissionName, packageName, false, + Process.SYSTEM_UID, userId, permissionCallback); } catch (IllegalArgumentException e) { Slog.e(TAG, "Could not revoke " + permissionName + " from " + packageName, e); @@ -552,59 +549,9 @@ public class PermissionManagerService { } - private void revokeAllPermissions( - @NonNull List<BasePermission> bps, - @NonNull List<String> allPackageNames, - @Nullable PermissionCallback permissionCallback) { - AsyncTask.execute(() -> { - final int numRemovedPermissions = bps.size(); - for (int permissionNum = 0; permissionNum < numRemovedPermissions; permissionNum++) { - final int[] userIds = mUserManagerInt.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 ApplicationInfo applicationInfo = mPackageManagerInt.getApplicationInfo( - packageName, 0, Process.SYSTEM_UID, 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).getName(); - if (checkPermission(permissionName, packageName, UserHandle.USER_SYSTEM, - userId) == PackageManager.PERMISSION_GRANTED) { - try { - revokeRuntimePermission( - permissionName, - packageName, - bps.get(permissionNum), - false, - Process.SYSTEM_UID, - userId, - permissionCallback, - true); - } catch (IllegalArgumentException e) { - Slog.e(TAG, "Could not revoke " + permissionName + " from " - + packageName, e); - } - } - } - } - } - }); - } - - private void removeAllPermissions( - @NonNull PackageParser.Package pkg, - @NonNull List<String> allPackageNames, - @Nullable PermissionCallback permissionCallback, - boolean chatty) { + private void removeAllPermissions(PackageParser.Package pkg, boolean chatty) { synchronized (mLock) { int N = pkg.permissions.size(); - List<BasePermission> bps = new ArrayList<BasePermission>(N); StringBuilder r = null; for (int i=0; i<N; i++) { PackageParser.Permission p = pkg.permissions.get(i); @@ -613,9 +560,6 @@ public class PermissionManagerService { bp = mSettings.mPermissionTrees.get(p.info.name); } if (bp != null && bp.isPermission(p)) { - if ((p.info.getProtection() & PermissionInfo.PROTECTION_DANGEROUS) != 0) { - bps.add(bp); - } bp.setPermission(null); if (DEBUG_REMOVE && chatty) { if (r == null) { @@ -634,7 +578,6 @@ public class PermissionManagerService { } } } - revokeAllPermissions(bps, allPackageNames, permissionCallback); if (r != null) { if (DEBUG_REMOVE) Log.d(TAG, " Permissions: " + r); } @@ -1547,10 +1490,9 @@ public class PermissionManagerService { } } - - private void revokeRuntimePermission(String permName, String packageName, BasePermission bp, - boolean overridePolicy, int callingUid, int userId, PermissionCallback callback, - boolean permissionRemoved) { + + private void revokeRuntimePermission(String permName, String packageName, + boolean overridePolicy, int callingUid, int userId, PermissionCallback callback) { if (!mUserManagerInt.exists(userId)) { Log.e(TAG, "No such user:" + userId); return; @@ -1575,7 +1517,7 @@ public class PermissionManagerService { if (mPackageManagerInt.filterAppAccess(pkg, Binder.getCallingUid(), userId)) { throw new IllegalArgumentException("Unknown package: " + packageName); } - + final BasePermission bp = mSettings.getPermissionLocked(permName); if (bp == null) { throw new IllegalArgumentException("Unknown permission: " + permName); } @@ -2131,10 +2073,8 @@ public class PermissionManagerService { PermissionManagerService.this.addAllPermissionGroups(pkg, chatty); } @Override - public void removeAllPermissions(Package pkg, List<String> allPackageNames, - PermissionCallback permissionCallback, boolean chatty) { - PermissionManagerService.this.removeAllPermissions( - pkg, allPackageNames, permissionCallback, chatty); + public void removeAllPermissions(Package pkg, boolean chatty) { + PermissionManagerService.this.removeAllPermissions(pkg, chatty); } @Override public boolean addDynamicPermission(PermissionInfo info, boolean async, int callingUid, @@ -2170,8 +2110,7 @@ public class PermissionManagerService { boolean overridePolicy, int callingUid, int userId, PermissionCallback callback) { PermissionManagerService.this.revokeRuntimePermission(permName, packageName, - mSettings.getPermission(permName), overridePolicy, callingUid, userId, - callback, false); + overridePolicy, callingUid, userId, callback); } @Override public void updatePermissions(String packageName, Package pkg, boolean replaceGrant, |