Commit 6ac3d6e6 authored May 10, 2022 by Song Hu Committed by Automerger Merge Worker May 10, 2022

Merge "ChooserActivity populates intentFilter mimeType with intent.getType()...

Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev am: 6c90bbe1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842

Change-Id: Ic13fc820bc9a805f567165ad68645c7f2c225b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/com/android/internal/app/ChooserActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1861,10 +1861,10 @@ public class ChooserActivity extends ResolverActivity implements
		try {
		final Intent intent = getTargetIntent();
		String dataString = intent.getDataString();
		if (intent.getType() == null) {
		if (!TextUtils.isEmpty(dataString)) {
		return new IntentFilter(intent.getAction(), dataString);
		}
		if (intent.getType() == null) {
		Log.e(TAG, "Failed to get target intent filter: intent data and type are null");
		return null;
		}