Merge "Fix multi-user handling in PermissionPolicyService." into udc-dev (f210b1bc) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PermissionPolicyService.java

+24 −13

Original line number	Diff line number	Diff line
		@@ -194,29 +194,40 @@ public final class PermissionPolicyService extends SystemService {

		mPackageManagerInternal.getPackageList(new PackageListObserver() {
		@Override
		public void onPackageAdded(String packageName, int uid) {
		final int userId = UserHandle.getUserId(uid);
		public void onPackageAdded(String packageName, int appId) {
		final int[] userIds = LocalServices.getService(UserManagerInternal.class)
		.getUserIds();
		for (final int userId : userIds) {
		if (isStarted(userId)) {
		synchronizePackagePermissionsAndAppOpsForUser(packageName, userId);
		}
		}
		}

		@Override
		public void onPackageChanged(String packageName, int uid) {
		final int userId = UserHandle.getUserId(uid);
		public void onPackageChanged(String packageName, int appId) {
		final int[] userIds = LocalServices.getService(UserManagerInternal.class)
		.getUserIds();
		for (final int userId : userIds) {
		if (isStarted(userId)) {
		synchronizePackagePermissionsAndAppOpsForUser(packageName, userId);
		final int uid = UserHandle.getUid(userId, appId);
		resetAppOpPermissionsIfNotRequestedForUid(uid);
		}
		}
		}

		@Override
		public void onPackageRemoved(String packageName, int uid) {
		final int userId = UserHandle.getUserId(uid);
		public void onPackageRemoved(String packageName, int appId) {
		final int[] userIds = LocalServices.getService(UserManagerInternal.class)
		.getUserIds();
		for (final int userId : userIds) {
		if (isStarted(userId)) {
		final int uid = UserHandle.getUid(userId, appId);
		resetAppOpPermissionsIfNotRequestedForUid(uid);
		}
		}
		}
		});

		mPermissionManagerInternal.addOnRuntimePermissionStateChangedListener(