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

services/core/java/com/android/server/accounts/AccountManagerService.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -5048,6 +5048,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
		@@ -693,13 +693,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;