From 28a815c737c0873c29a7c746600600fbbe3e3169 Mon Sep 17 00:00:00 2001 From: Tomasz Mikolajewski Date: Fri, 28 Oct 2016 15:54:11 +0900 Subject: [PATCH] Add CATEGORY_TYPED_OPENABLE for ACTION_SEND[_MULTIPLE]. This category should be set when any virtual files are passed via an Intent. Test: CTS coming. Bug: 28409713 Change-Id: I28eaecb3b8e9b604818adbdaf7fdaef1b4f9a564 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/content/Intent.java | 15 +++++++++++++++ 4 files changed, 18 insertions(+) diff --git a/api/current.txt b/api/current.txt index 10d37dba20b25..944863157db49 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8785,6 +8785,7 @@ package android.content { field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE"; field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB"; field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST"; + field public static final java.lang.String CATEGORY_TYPED_OPENABLE = "android.intent.category.TYPED_OPENABLE"; field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST"; field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE"; field public static final android.os.Parcelable.Creator CREATOR; diff --git a/api/system-current.txt b/api/system-current.txt index 0370287a1e54f..0fa3220dd8c17 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9143,6 +9143,7 @@ package android.content { field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE"; field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB"; field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST"; + field public static final java.lang.String CATEGORY_TYPED_OPENABLE = "android.intent.category.TYPED_OPENABLE"; field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST"; field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE"; field public static final android.os.Parcelable.Creator CREATOR; diff --git a/api/test-current.txt b/api/test-current.txt index 6b1d698f5eaaf..ae95c27e6bc20 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -8804,6 +8804,7 @@ package android.content { field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE"; field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB"; field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST"; + field public static final java.lang.String CATEGORY_TYPED_OPENABLE = "android.intent.category.TYPED_OPENABLE"; field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST"; field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE"; field public static final android.os.Parcelable.Creator CREATOR; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 50589fea233b8..71cbeac23cdef 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3482,6 +3482,21 @@ public class Intent implements Parcelable, Cloneable { @SdkConstant(SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_OPENABLE = "android.intent.category.OPENABLE"; + /** + * Used to indicate that an intent filter can accept files which are not necessarily + * openable by {@link ContentResolver#openFileDescriptor(Uri, String)}, but + * at least streamable via + * {@link ContentResolver#openTypedAssetFileDescriptor(Uri, String, Bundle)} + * using one of the stream types exposed via + * {@link ContentResolver#getStreamTypes(Uri, String)}. + * + * @see #ACTION_SEND + * @see #ACTION_SEND_MULTIPLE + */ + @SdkConstant(SdkConstantType.INTENT_CATEGORY) + public static final String CATEGORY_TYPED_OPENABLE = + "android.intent.category.TYPED_OPENABLE"; + /** * To be used as code under test for framework instrumentation tests. */