Merge cherrypicks of [5141854, 5140474] into pi-qpr1-release (e9e3f8a4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;

services/core/java/com/android/server/pm/permission/BasePermission.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.util.Slog;

		import com.android.server.pm.DumpState;
		import com.android.server.pm.PackageManagerService;
		import com.android.server.pm.PackageSetting;
		import com.android.server.pm.PackageSettingBase;

		import org.xmlpull.v1.XmlPullParser;
		@@ -375,10 +374,8 @@ public final class BasePermission {
		}

		public void enforceDeclaredUsedAndRuntimeOrDevelopment(PackageParser.Package pkg) {
		final PackageSetting pkgSetting = (PackageSetting) pkg.mExtras;
		final PermissionsState permsState = pkgSetting.getPermissionsState();
		int index = pkg.requestedPermissions.indexOf(name);
		if (!permsState.hasRequestedPermission(name) && index == -1) {
		if (index == -1) {
		throw new SecurityException("Package " + pkg.packageName
		+ " has not requested permission " + name);
		}

services/core/java/com/android/server/pm/permission/PermissionManagerInternal.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -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,

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+10 −71

Original line number	Diff line number	Diff line
		@@ -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);
		}
		@@ -1548,9 +1491,8 @@ 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,

services/core/java/com/android/server/pm/permission/PermissionsState.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -20,9 +20,9 @@ import android.content.pm.PackageManager;
		import android.os.UserHandle;
		import android.util.ArrayMap;
		import android.util.ArraySet;

		import android.util.SparseArray;
		import android.util.SparseBooleanArray;

		import com.android.internal.util.ArrayUtils;

		import java.util.ArrayList;
		@@ -290,13 +290,6 @@ public final class PermissionsState {
		return false;
		}

		/**
		* Returns whether the state has any known request for the given permission name,
		* whether or not it has been granted.
		*/
		public boolean hasRequestedPermission(String name) {
		return mPermissions != null && (mPermissions.get(name) != null);
		}
		/**
		* Gets all permissions for a given device user id regardless if they
		* are install time or runtime permissions.