Merge "Update the logging for package allowlist checks." into main (ac8741d1) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/utils/PackageUtils.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -121,8 +121,14 @@ public final class PackageUtils {
		*/
		public static boolean isPackageAllowlisted(Context context,
		PackageManagerInternal packageManagerInternal, @NonNull String packageName) {
		return isPackageAllowlisted(context, packageManagerInternal, packageName,
		boolean isAllowListed = isPackageAllowlisted(context, packageManagerInternal, packageName,
		config_companionDevicePackages, config_companionDeviceCerts);
		if (!isAllowListed) {
		Slog.i(TAG, "Package: " + packageName
		+ " is not allowlisted to bypass association dialog");
		}

		return isAllowListed;
		}

		/**
		@@ -130,8 +136,14 @@ public final class PackageUtils {
		*/
		public static boolean isPermSyncAutoEnabled(Context context,
		PackageManagerInternal packageManagerInternal, String packageName) {
		return isPackageAllowlisted(context, packageManagerInternal, packageName,
		boolean isAllowListed = isPackageAllowlisted(context, packageManagerInternal, packageName,
		config_companionPermSyncEnabledPackages, config_companionPermSyncEnabledCerts);
		if (!isAllowListed) {
		Slog.i(TAG, "Package: " + packageName
		+ " is not allowlisted to bypass perm sync dialog");
		}

		return isAllowListed;
		}

		private static boolean isPackageAllowlisted(Context context,