From 56ceba436a4998ab565bd53ca71cc9ad20c931e0 Mon Sep 17 00:00:00 2001
From: Varun Shah <varunshah@google.com>
Date: Mon, 20 Mar 2023 23:22:48 +0000
Subject: [PATCH] Restrict adding the implicit READ_URI grant flag.

Only implicitly add FLAG_GRANT_READ_URI_PERMISSION if the stream is not null.

Bug: 223589582
Change-Id: Ie6c52ca52c4d006bdc650a3ad51183e4dbafa842
Test: manual
---
 core/java/android/content/Intent.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 154068eb9e092..764826baae074 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -12348,7 +12348,9 @@ public class Intent implements Parcelable, Cloneable {
                             null, new String[] { getType() },
                             new ClipData.Item(text, htmlText, null, stream));
                     setClipData(clipData);
-                    addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+                    if (stream != null) {
+                        addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+                    }
                     return true;
                 }
             } catch (ClassCastException e) {
@@ -12387,7 +12389,9 @@ public class Intent implements Parcelable, Cloneable {
                     }
 
                     setClipData(clipData);
-                    addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+                    if (streams != null) {
+                        addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+                    }
                     return true;
                 }
             } catch (ClassCastException e) {