Merge "Don't grant runtime permissions on install to legacy apps" (fc1a1bad) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -1375,7 +1375,9 @@ public class PackageManagerService extends IPackageManager.Stub {
		// Now that we successfully installed the package, grant runtime
		// permissions if requested before broadcasting the install.
		if ((args.installFlags
		& PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0) {
		& PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0
		&& res.pkg.applicationInfo.targetSdkVersion
		>= Build.VERSION_CODES.M) {
		grantRequestedRuntimePermissions(res.pkg, args.user.getIdentifier(),
		args.installGrantPermissions);
		}
		@@ -3567,6 +3569,11 @@ public class PackageManagerService extends IPackageManager.Stub {
		return;
		}

		if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
		Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
		return;
		}

		final int result = permissionsState.grantRuntimePermission(bp, userId);
		switch (result) {
		case PermissionsState.PERMISSION_OPERATION_FAILURE: {