Merge "Revert "Update the enabled state with the current user state"" into main (21d4b87e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -596,7 +596,7 @@ public class PackageInfoUtils {
		ai.requiredDisplayCategory = a.getRequiredDisplayCategory();
		ai.requireContentUriPermissionFromCaller = a.getRequireContentUriPermissionFromCaller();
		ai.setKnownActivityEmbeddingCerts(a.getKnownActivityEmbeddingCerts());
		assignFieldsComponentInfoParsedMainComponent(ai, a, pkgSetting, state, userId);
		assignFieldsComponentInfoParsedMainComponent(ai, a, pkgSetting, userId);
		return ai;
		}

		@@ -659,7 +659,7 @@ public class PackageInfoUtils {
		// Backwards compatibility, coerce to null if empty
		si.metaData = metaData.isEmpty() ? null : metaData;
		}
		assignFieldsComponentInfoParsedMainComponent(si, s, pkgSetting, state, userId);
		assignFieldsComponentInfoParsedMainComponent(si, s, pkgSetting, userId);
		return si;
		}

		@@ -710,7 +710,7 @@ public class PackageInfoUtils {
		pi.metaData = metaData.isEmpty() ? null : metaData;
		}
		pi.applicationInfo = applicationInfo;
		assignFieldsComponentInfoParsedMainComponent(pi, p, pkgSetting, state, userId);
		assignFieldsComponentInfoParsedMainComponent(pi, p, pkgSetting, userId);
		return pi;
		}

		@@ -903,13 +903,8 @@ public class PackageInfoUtils {

		private static void assignFieldsComponentInfoParsedMainComponent(
		@NonNull ComponentInfo info, @NonNull ParsedMainComponent component,
		@NonNull PackageStateInternal pkgSetting, @NonNull PackageUserStateInternal state,
		@UserIdInt int userId) {
		@NonNull PackageStateInternal pkgSetting, @UserIdInt int userId) {
		assignFieldsComponentInfoParsedMainComponent(info, component);
		// overwrite the enabled state with the current user state
		info.enabled = PackageUserStateUtils.isEnabled(state, info.applicationInfo.enabled,
		info.enabled, info.name, /* flags */ 0);

		Pair<CharSequence, Integer> labelAndIcon =
		ParsedComponentStateUtils.getNonLocalizedLabelAndIcon(component, pkgSetting,
		userId);