Merge "[pm] Flag removal: lightweight_invisible_label_detection" into main (b12a221f) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/LauncherActivityInfo.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -85,16 +85,15 @@ public class LauncherActivityInfo {
		}

		/**
		* Retrieves the label for the activity.
		* Retrieves the label for the activity. If the activity's label is invisible
		* for the user, use the application's label instead. If the application's label
		* is still invisible for the user, use the package name instead.
		*
		* @return The label for the activity.
		* @return The label for the activity. If the activity's label is invisible for the user,
		* return the application's label instead. If the application's label
		* is still invisible for the user, return the package name instead.
		*/
		public CharSequence getLabel() {
		if (!Flags.lightweightInvisibleLabelDetection()) {
		// TODO: Go through LauncherAppsService
		return getActivityInfo().loadLabel(mPm);
		}

		CharSequence label = getActivityInfo().loadLabel(mPm).toString().trim();
		// If the activity label is visible to the user, return the original activity label
		if (isVisible(label)) {

+0 −7

Original line number	Diff line number	Diff line
		@@ -82,13 +82,6 @@ flag {
		bug: "269728874"
		}

		flag {
		name: "lightweight_invisible_label_detection"
		namespace: "package_manager_service"
		description: "Feature flag to detect the invisible labels in Launcher Apps"
		bug: "299586370"
		}

		flag {
		name: "read_install_info"
		is_exported: true