diff options
| author | 2023-04-18 04:34:14 +0000 | |
|---|---|---|
| committer | 2023-04-18 04:34:14 +0000 | |
| commit | 0bb91e1d18ee4857252fe61384c7aebb014747c9 (patch) | |
| tree | 8379d6a18fc22a345e0a50f3acdb2320aead5d4c | |
| parent | d9a252dcca7e77474dba9b15a5f2714a2049e6c7 (diff) | |
| parent | 56ceba436a4998ab565bd53ca71cc9ad20c931e0 (diff) | |
Merge "Restrict adding the implicit READ_URI grant flag." into udc-dev
| -rw-r--r-- | core/java/android/content/Intent.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 74a69a623790..307f30619be2 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -12349,7 +12349,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) { @@ -12388,7 +12390,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) { |