Merge "Disable target pinning for partial screenshare." into main (12911b50) · Commits · e / os / android_frameworks_base

core/java/android/service/chooser/flags.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -27,3 +27,14 @@ flag {
		description: "Provides additional callbacks with information about user actions in ChooserResult"
		bug: "263474465"
		}

		flag {
		name: "legacy_chooser_pinning_removal"
		namespace: "intentresolver"
		description: "Removing pinning functionality from the legacy chooser (used by partial screenshare)"
		bug: "301068735"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ import android.provider.Downloads;
		import android.provider.OpenableColumns;
		import android.provider.Settings;
		import android.service.chooser.ChooserTarget;
		import android.service.chooser.Flags;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.HashedStringCache;
		@@ -2543,6 +2544,9 @@ public class ChooserActivity extends ResolverActivity implements

		@Override
		public boolean isComponentPinned(ComponentName name) {
		if (Flags.legacyChooserPinningRemoval()) {
		return false;
		}
		return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);
		}

		@@ -3147,6 +3151,10 @@ public class ChooserActivity extends ResolverActivity implements
		}

		private boolean shouldShowTargetDetails(TargetInfo ti) {
		if (Flags.legacyChooserPinningRemoval()) {
		// Never show the long press menu if we've removed pinning.
		return false;
		}
		ComponentName nearbyShare = getNearbySharingComponent();
		// Suppress target details for nearby share to hide pin/unpin action
		boolean isNearbyShare = nearbyShare != null && nearbyShare.equals(