Merge "Adjust "services.core" defaults for Error Prone." (2716a856) · Commits · e / os / android_frameworks_base

Android.bp

+3 −2

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ java_defaults {
		],
		errorprone: {
		javacflags: [
		"-Xep:AndroidFrameworkBinderIdentity:ERROR",
		// "-Xep:AndroidFrameworkBinderIdentity:ERROR",
		"-Xep:AndroidFrameworkCompatChange:ERROR",
		"-Xep:AndroidFrameworkUid:ERROR",
		// "-Xep:AndroidFrameworkUid:ERROR",
		// NOTE: only enable to generate local patchfiles
		// "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",
		// "-XepPatchLocation:/tmp/refaster/",
		@@ -44,6 +44,7 @@ java_defaults {
		"-Xep:AndroidFrameworkEfficientCollections:OFF",
		"-Xep:AndroidFrameworkEfficientParcelable:OFF",
		"-Xep:AndroidFrameworkEfficientStrings:OFF",
		"-Xep:AndroidFrameworkEfficientXml:OFF",
		],
		},
		}

services/core/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ genrule {

		java_library_static {
		name: "services.core.unboosted",
		defaults: ["platform_service_defaults"],
		srcs: [
		":services.core.protologsrc",
		":dumpstate_aidl",
		@@ -146,7 +147,6 @@ java_genrule {

		java_library {
		name: "services.core",
		defaults: ["platform_service_defaults"],
		static_libs: ["services.core.priorityboosted"],
		}

services/core/java/com/android/server/am/ActiveServices.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1630,6 +1630,8 @@ public final class ActiveServices {
		}
		}

		// TODO: remove as part of fixing b/173627642
		@SuppressWarnings("AndroidFrameworkCompatChange")
		private void postFgsNotificationLocked(ServiceRecord r) {
		boolean showNow = !mAm.mConstants.mFlagFgsNotificationDeferralEnabled;
		if (!showNow) {

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

+16 −12

Original line number	Diff line number	Diff line
		@@ -17864,6 +17864,17 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		/*
		* Cannot properly check CANNOT_INSTALL_WITH_BAD_PERMISSION_GROUPS using CompatChanges
		* as this only works for packages that are installed
		*
		* TODO: Move logic for permission group compatibility into PermissionManagerService
		*/
		@SuppressWarnings("AndroidFrameworkCompatChange")
		private static boolean cannotInstallWithBadPermissionGroups(ParsedPackage parsedPackage) {
		return parsedPackage.getTargetSdkVersion() >= Build.VERSION_CODES.S;
		}

		@GuardedBy("mInstallLock")
		private PrepareResult preparePackageLI(InstallArgs args, PackageInstalledInfo res)
		throws PrepareFailure {
		@@ -17906,7 +17917,7 @@ public class PackageManagerService extends IPackageManager.Stub
		\| (onExternal ? PackageParser.PARSE_EXTERNAL_STORAGE : 0);

		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parsePackage");
		ParsedPackage parsedPackage;
		final ParsedPackage parsedPackage;
		try (PackageParser2 pp = new PackageParser2(mSeparateProcesses, false, mMetrics, null,
		mPackageParserCallback)) {
		parsedPackage = pp.parsePackage(tmpPackageFile, parseFlags, false);
		@@ -18022,15 +18033,6 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		/*
		* Cannot properly check CANNOT_INSTALL_WITH_BAD_PERMISSION_GROUPS using CompatChanges
		* as this only works for packages that are installed
		*
		* TODO: Move logic for permission group compatibility into PermissionManagerService
		*/
		boolean cannotInstallWithBadPermissionGroups =
		parsedPackage.getTargetSdkVersion() >= Build.VERSION_CODES.S;

		PackageSetting ps = mSettings.mPackages.get(pkgName);
		if (ps != null) {
		if (DEBUG_INSTALL) Slog.d(TAG, "Existing package: " + ps);
		@@ -18088,7 +18090,8 @@ public class PackageManagerService extends IPackageManager.Stub
		parsedPackage.getPermissionGroups().get(groupNum);
		final PermissionGroupInfo sourceGroup = getPermissionGroupInfo(group.getName(), 0);

		if (sourceGroup != null && cannotInstallWithBadPermissionGroups) {
		if (sourceGroup != null
		&& cannotInstallWithBadPermissionGroups(parsedPackage)) {
		final String sourcePackageName = sourceGroup.packageName;

		if ((replace \|\| !parsedPackage.getPackageName().equals(sourcePackageName))
		@@ -18163,7 +18166,8 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (perm.getGroup() != null && cannotInstallWithBadPermissionGroups) {
		if (perm.getGroup() != null
		&& cannotInstallWithBadPermissionGroups(parsedPackage)) {
		boolean isPermGroupDefinedByPackage = false;
		for (int groupNum = 0; groupNum < numGroups; groupNum++) {
		if (parsedPackage.getPermissionGroups().get(groupNum).getName()