Merge cherrypicks of ['googleplex-android-review.googlesource.com/28502296',... (ba8897f3) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -7855,6 +7855,9 @@ public class Intent implements Parcelable, Cloneable {
		int eq = uri.indexOf('=', i);
		if (eq < 0) eq = i-1;
		int semi = uri.indexOf(';', i);
		if (semi < 0) {
		throw new URISyntaxException(uri, "uri end not found");
		}
		String value = eq < semi ? Uri.decode(uri.substring(eq + 1, semi)) : "";

		// action

+3 −0

Original line number	Diff line number	Diff line
		@@ -4959,6 +4959,9 @@ public class AccountManagerService
		if (resolveInfo == null) {
		return false;
		}
		if ("content".equals(intent.getScheme())) {
		return false;
		}
		ActivityInfo targetActivityInfo = resolveInfo.activityInfo;
		int targetUid = targetActivityInfo.applicationInfo.uid;
		PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);

+7 −2

Original line number	Diff line number	Diff line
		@@ -673,13 +673,18 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		params.appLabel = TextUtils.trimToSize(params.appLabel,
		PackageItemInfo.MAX_SAFE_LABEL_LENGTH);

		// Validate installer package name.
		// Validate requested installer package name.
		if (params.installerPackageName != null && !isValidPackageName(
		params.installerPackageName)) {
		params.installerPackageName = null;
		}

		var requestedInstallerPackageName =
		// Validate installer package name.
		if (installerPackageName != null && !isValidPackageName(installerPackageName)) {
		installerPackageName = null;
		}

		String requestedInstallerPackageName =
		params.installerPackageName != null ? params.installerPackageName
		: installerPackageName;