From 64eea1da84ee8f7883d3b307e50fcd24f1bc30d9 Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Mon, 26 Sep 2022 20:34:59 +0000 Subject: Multi-image editor fix Same as ag/20056428, but unbundled. Bug: 247638926 Test: Share multiple images from photos, verify that edit button doesn't appear. Change-Id: I0b135dae151abf307e30639c309c2d459938d867 --- java/src/com/android/intentresolver/ChooserActivity.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'java') diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index 14d77427..d4855382 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -1108,6 +1108,19 @@ public class ChooserActivity extends ResolverActivity implements resolveIntent.setFlags(originalIntent.getFlags() & URI_PERMISSION_INTENT_FLAGS); resolveIntent.setComponent(cn); resolveIntent.setAction(Intent.ACTION_EDIT); + String originalAction = originalIntent.getAction(); + if (Intent.ACTION_SEND.equals(originalAction)) { + if (resolveIntent.getData() == null) { + Uri uri = resolveIntent.getParcelableExtra(Intent.EXTRA_STREAM); + if (uri != null) { + String mimeType = getContentResolver().getType(uri); + resolveIntent.setDataAndType(uri, mimeType); + } + } + } else { + Log.e(TAG, originalAction + " is not supported."); + return null; + } final ResolveInfo ri = getPackageManager().resolveActivity( resolveIntent, PackageManager.GET_META_DATA); if (ri == null || ri.activityInfo == null) { -- cgit v1.2.3-59-g8ed1b