diff options
| author | 2022-10-04 20:23:38 +0000 | |
|---|---|---|
| committer | 2022-10-04 20:23:38 +0000 | |
| commit | d927e82cea0184f8f2f4b9a1ee687ea3175b8a35 (patch) | |
| tree | ddc47e68114c85b021f31206fee9bd3a1c0863a2 /java | |
| parent | cd85b7238c065a870945d9cf6cddc118caefd6a0 (diff) | |
| parent | f5e7d4b83f9628cbe59f07ce03153ae5c671f89a (diff) | |
Merge "Multi-image editor fix" into tm-qpr-dev am: f5e7d4b83f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20055210
Change-Id: Ie2406e0947872702330a25ac30c154f495713d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 13 |
1 files changed, 13 insertions, 0 deletions
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) { |