From 09daaaf5e209cab2c25b6d1445eaa7fe1f5e4f27 Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Mon, 26 Sep 2022 20:30:24 +0000
Subject: [PATCH] Copy multi-image editor fix to QPR

Already fixed in master via https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

This is that change, but in QPR.

Test: Share multiple images from photos, verify that edit button doesn't
      appear.
Bug: 247638926
Merged-In: Id6ce93efacd54a86d870595ae32b4e6efcec0c04
Change-Id: I51b7d332b6b7e59ee559716022d795bb8de4a71c
---
 .../com/android/internal/app/ChooserActivity.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 620f1776af330..f5ba275b604b9 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -1114,6 +1114,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) {