Merge "RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases" into udc-dev (0d84878d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/AppOpsService.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -2640,6 +2640,10 @@ public class AppOpsService extends IAppOpsService.Stub {
		return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,
		packageName);
		}
		if (proxyAttributionTag != null
		&& !isAttributionTagDefined(packageName, proxyPackageName, proxyAttributionTag)) {
		proxyAttributionTag = null;
		}

		synchronized (this) {
		final Ops ops = getOpsLocked(uid, packageName, attributionTag,
		@@ -3177,6 +3181,10 @@ public class AppOpsService extends IAppOpsService.Stub {
		return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,
		packageName);
		}
		if (proxyAttributionTag != null
		&& !isAttributionTagDefined(packageName, proxyPackageName, proxyAttributionTag)) {
		proxyAttributionTag = null;
		}

		boolean isRestricted = false;
		int startType = START_TYPE_FAILED;
		@@ -3909,6 +3917,36 @@ public class AppOpsService extends IAppOpsService.Stub {
		return false;
		}

		/**
		* Checks to see if the attribution tag is defined in either package or proxyPackage.
		* This method is intended for ProxyAttributionTag validation and returns false
		* if it does not exist in either one of them.
		*
		* @param packageName Name of the package
		* @param proxyPackageName Name of the proxy package
		* @param attributionTag attribution tag to be checked
		*
		* @return boolean specifying if attribution tag is valid or not
		*/
		private boolean isAttributionTagDefined(@Nullable String packageName,
		@Nullable String proxyPackageName,
		@Nullable String attributionTag) {
		if (packageName == null) {
		return false;
		} else if (attributionTag == null) {
		return true;
		}
		PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class);
		if (proxyPackageName != null) {
		AndroidPackage proxyPkg = pmInt.getPackage(proxyPackageName);
		if (proxyPkg != null && isAttributionInPackage(proxyPkg, attributionTag)) {
		return true;
		}
		}
		AndroidPackage pkg = pmInt.getPackage(packageName);
		return isAttributionInPackage(pkg, attributionTag);
		}

		/**
		* Get (and potentially create) ops.
		*

services/core/java/com/android/server/pm/pkg/component/ParsedAttributionImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import java.util.List;
		public class ParsedAttributionImpl implements ParsedAttribution, Parcelable {

		/** Maximum amount of attributions per package */
		static final int MAX_NUM_ATTRIBUTIONS = 10000;
		static final int MAX_NUM_ATTRIBUTIONS = 1000;

		/** Tag of the attribution */
		private @NonNull String tag;