From fbdcff39cdac9ce6cfed9ea6cdb0e7aa28894d58 Mon Sep 17 00:00:00 2001 From: Song Hu Date: Sat, 7 May 2022 15:12:55 -0700 Subject: [PATCH] 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. Test: atest Test: test on phone Bug: 229607293 Change-Id: I8d610e4c7033b25eea8a98885339207a723716b6 --- core/java/com/android/internal/app/ChooserActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index ad6ba6ba6df2d..7feaad8e29eda 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -1861,10 +1861,10 @@ public class ChooserActivity extends ResolverActivity implements try { final Intent intent = getTargetIntent(); String dataString = intent.getDataString(); - if (!TextUtils.isEmpty(dataString)) { - return new IntentFilter(intent.getAction(), dataString); - } if (intent.getType() == null) { + if (!TextUtils.isEmpty(dataString)) { + return new IntentFilter(intent.getAction(), dataString); + } Log.e(TAG, "Failed to get target intent filter: intent data and type are null"); return null; }