Merge "Restrict adding the implicit READ_URI grant flag." into udc-dev (0bb91e1d) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -12349,7 +12349,9 @@ public class Intent implements Parcelable, Cloneable {
		null, new String[] { getType() },
		new ClipData.Item(text, htmlText, null, stream));
		setClipData(clipData);
		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);
		if (streams != null) {
		addFlags(FLAG_GRANT_READ_URI_PERMISSION);
		}
		return true;
		}
		} catch (ClassCastException e) {