Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: 6c90bbe1cf

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

Change-Id: If8bfc9a0be5bafcb4b2fb837666d95979a9903c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Hu
2022-05-10 20:38:48 +00:00
committed by Automerger Merge Worker
parent d9106a4ad1 6c90bbe1cf
commit a0d00523f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ChooserActivity.java
View File

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