Merge "Revert "Reset any non-runtime permissions with user sensitive"" into... (4f9337dd) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -2499,24 +2499,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		synchronized (mLock) {
		ArraySet<String> newImplicitPermissions = new ArraySet<>();

		// TODO ntmyren: Remove once propagated to droidfood
		int flagMask = PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED
		\| PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED;
		int user = UserHandle.getUserId(pkg.getUid());

		final int N = pkg.getRequestedPermissions().size();
		for (int i = 0; i < N; i++) {
		final String permName = pkg.getRequestedPermissions().get(i);
		final BasePermission bp = mSettings.getPermissionLocked(permName);

		// TODO ntmyren: Remove once propagated to droidfood
		if (bp != null && !bp.isRuntime()) {
		PermissionState permState = permissionsState.getInstallPermissionState(bp.name);
		if (permState == null \|\| (permState.getFlags() & flagMask) != 0) {
		permissionsState.updatePermissionFlags(bp, user, flagMask, 0);
		}
		}

		final boolean appSupportsRuntimePermissions =
		pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M;
		String upgradedActivityRecognitionPermission = null;