Compute policy for read-external-storage for uid (3f9faa89) · Commits · e / os / android_frameworks_base

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

+67 −5

Original line number	Original line	Diff line number	Diff line
	@@ -28,11 +28,14 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INST
	import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT;		import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT;
	import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT;		import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT;

			import static java.lang.Integer.min;

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.app.AppOpsManager;		import android.app.AppOpsManager;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.ApplicationInfo;		import android.content.pm.ApplicationInfo;
			import android.content.pm.PackageManager;
	import android.os.Build;		import android.os.Build;
	import android.os.UserHandle;		import android.os.UserHandle;

	@@ -72,6 +75,41 @@ public abstract class SoftRestrictedPermissionPolicy {
	}		}
	};		};

			/**
			* TargetSDK is per package. To make sure two apps int the same shared UID do not fight over
			* what to set, always compute the combined targetSDK.
			*
			* @param context A context
			* @param appInfo The app that is changed
			* @param user The user the app belongs to
			*
			* @return The minimum targetSDK of all apps sharing the uid of the app
			*/
			private static int getMinimumTargetSDK(@NonNull Context context,
			@NonNull ApplicationInfo appInfo, @NonNull UserHandle user) {
			PackageManager pm = context.getPackageManager();

			int minimumTargetSDK = appInfo.targetSdkVersion;

			String[] uidPkgs = pm.getPackagesForUid(appInfo.uid);
			if (uidPkgs != null) {
			for (String uidPkg : uidPkgs) {
			if (!uidPkg.equals(appInfo.packageName)) {
			ApplicationInfo uidPkgInfo;
			try {
			uidPkgInfo = pm.getApplicationInfoAsUser(uidPkg, 0, user);
			} catch (PackageManager.NameNotFoundException e) {
			continue;
			}

			minimumTargetSDK = min(minimumTargetSDK, uidPkgInfo.targetSdkVersion);
			}
			}
			}

			return minimumTargetSDK;
			}

	/**		/**
	* Get the policy for a soft restricted permission.		* Get the policy for a soft restricted permission.
	*		*
	@@ -99,12 +137,36 @@ public abstract class SoftRestrictedPermissionPolicy {
	final int targetSDK;		final int targetSDK;

	if (appInfo != null) {		if (appInfo != null) {
	flags = context.getPackageManager().getPermissionFlags(permission,		PackageManager pm = context.getPackageManager();
	appInfo.packageName, user);		flags = pm.getPermissionFlags(permission, appInfo.packageName, user);
	applyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;		applyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
	isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0;		isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0;
	hasRequestedLegacyExternalStorage = appInfo.hasRequestedLegacyExternalStorage();		targetSDK = getMinimumTargetSDK(context, appInfo, user);
	targetSDK = appInfo.targetSdkVersion;
			boolean hasAnyRequestedLegacyExternalStorage =
			appInfo.hasRequestedLegacyExternalStorage();

			// hasRequestedLegacyExternalStorage is per package. To make sure two apps in
			// the same shared UID do not fight over what to set, always compute the
			// combined hasRequestedLegacyExternalStorage
			String[] uidPkgs = pm.getPackagesForUid(appInfo.uid);
			if (uidPkgs != null) {
			for (String uidPkg : uidPkgs) {
			if (!uidPkg.equals(appInfo.packageName)) {
			ApplicationInfo uidPkgInfo;
			try {
			uidPkgInfo = pm.getApplicationInfoAsUser(uidPkg, 0, user);
			} catch (PackageManager.NameNotFoundException e) {
			continue;
			}

			hasAnyRequestedLegacyExternalStorage \|=
			uidPkgInfo.hasRequestedLegacyExternalStorage();
			}
			}
			}

			hasRequestedLegacyExternalStorage = hasAnyRequestedLegacyExternalStorage;
	} else {		} else {
	flags = 0;		flags = 0;
	applyRestriction = false;		applyRestriction = false;
	@@ -155,7 +217,7 @@ public abstract class SoftRestrictedPermissionPolicy {
	final int flags = context.getPackageManager().getPermissionFlags(permission,		final int flags = context.getPackageManager().getPermissionFlags(permission,
	appInfo.packageName, user);		appInfo.packageName, user);
	isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0;		isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0;
	targetSDK = appInfo.targetSdkVersion;		targetSDK = getMinimumTargetSDK(context, appInfo, user);
	} else {		} else {
	isWhiteListed = false;		isWhiteListed = false;
	targetSDK = 0;		targetSDK = 0;

services/core/java/com/android/server/policy/TEST_MAPPING

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,9 @@
	"options": [		"options": [
	{		{
	"include-filter": "android.permission2.cts.RestrictedPermissionsTest"		"include-filter": "android.permission2.cts.RestrictedPermissionsTest"
			},
			{
			"include-filter": "android.permission2.cts.RestrictedStoragePermissionSharedUidTest"
	}		}
	]		]
	},		},