commit 1e3e69212a379e3dacc38e250713063bc5a21a21
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 06 20:38:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 06 20:38:05 2022 +0000
tree d835b7fe11501d4b098f2babd1acef32768f3ec1
parent 39e3a67feb4f075f2308b629fdddc5848a15a5a2
parent 49c433e211c1b3ab2164cdd6491734c4be3e7013

Merge "Set an edit uri to data of ACTION_EDIT"

core/java/com/android/internal/app/ChooserActivity.java

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 7bb1ed8..9699c60 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -1176,6 +1176,19 @@
         final Intent resolveIntent = new Intent(originalIntent);
         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) {