Merge cherrypicks of [7828976, 7828456, 7829138, 7829140] into qt-release (48b1fed0) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1173,6 +1173,14 @@ public class PermissionManagerService {
	}		}
	}		}

			if (hardRestricted && !restrictionExempt
			&& (flags & FLAG_PERMISSION_SYSTEM_FIXED) != 0) {
			// Applying a hard restriction implies revoking it. This might
			// lead to a system-fixed, revoked permission.
			flags &= ~FLAG_PERMISSION_SYSTEM_FIXED;
			wasChanged = true;
			}

	if (wasChanged) {		if (wasChanged) {
	updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);		updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);
	}		}