Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-03 22:17:13 +00:00
committed by Android (Google) Code Review
parent 1061992733 81aebe7c3c
commit a73aee4cdc
4 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -9477,7 +9477,7 @@ package android.content {
field public static final deprecated java.lang.String EXTRA_SHORTCUT_INTENT = "android.intent.extra.shortcut.INTENT";
field public static final deprecated java.lang.String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";
field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";
field public static final deprecated java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";
field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";
field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

2
api/system-current.txt
View File

@@ -10008,7 +10008,7 @@ package android.content {
field public static final deprecated java.lang.String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";
field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";
field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";
field public static final deprecated java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";
field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";
field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

2
api/test-current.txt
View File

@@ -9510,7 +9510,7 @@ package android.content {
field public static final deprecated java.lang.String EXTRA_SHORTCUT_INTENT = "android.intent.extra.shortcut.INTENT";
field public static final deprecated java.lang.String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";
field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";
field public static final deprecated java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";
field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";
field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

40
core/java/android/content/Intent.java
View File

@@ -16,8 +16,6 @@
package android.content;
import static android.content.ContentProvider.maybeAddUserId;
import android.annotation.AnyRes;
import android.annotation.BroadcastBehavior;
import android.annotation.IntDef;
@@ -43,6 +41,7 @@ import android.os.ResultReceiver;
import android.os.ShellCommand;
import android.os.StrictMode;
import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.provider.DocumentsContract;
import android.provider.DocumentsProvider;
import android.provider.MediaStore;
@@ -50,9 +49,7 @@ import android.provider.OpenableColumns;
import android.util.ArraySet;
import android.util.AttributeSet;
import android.util.Log;
import com.android.internal.util.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -70,6 +67,8 @@ import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import static android.content.ContentProvider.maybeAddUserId;
/**
* An intent is an abstract description of an operation to be performed. It
* can be used with {@link Context#startActivity(Intent) startActivity} to
@@ -3898,23 +3897,9 @@ public class Intent implements Parcelable, Cloneable {
public static final String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
/**
* A content: URI holding a stream of data associated with the Intent, used
* with {@link #ACTION_SEND} to supply the data being sent.
* <p>
* Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN} this value
* will be automatically promoted to {@link Intent#setClipData(ClipData)}
* when that value is not already defined.
* <p>
* Starting in {@link android.os.Build.VERSION_CODES#O} this value will be
* automatically demoted from {@link Intent#getClipData()} when this value
* is not already defined.
*
* @deprecated apps should use {@link Intent#setClipData(ClipData)} and
* {@link Intent#getClipData()} instead of this extra, since
* only those APIs can extend temporary permission grants to the
* underlying resource.
* A content: URI holding a stream of data associated with the Intent,
* used with {@link #ACTION_SEND} to supply the data being sent.
*/
@Deprecated
public static final String EXTRA_STREAM = "android.intent.extra.STREAM";
/**
@@ -9459,21 +9444,6 @@ public class Intent implements Parcelable, Cloneable {
mContentUserHint = UserHandle.USER_CURRENT;
}
}
// If someone is sending us ClipData, but not EXTRA_STREAM, offer to
// downgrade that content for older apps to find
if (mClipData != null && mClipData.getItemCount() > 0 && !hasExtra(EXTRA_STREAM)) {
final String action = getAction();
if (ACTION_SEND.equals(action)) {
putExtra(EXTRA_STREAM, mClipData.getItemAt(0).getUri());
} else if (ACTION_SEND_MULTIPLE.equals(action)) {
final ArrayList<Uri> list = new ArrayList<>();
for (int i = 0; i < mClipData.getItemCount(); i++) {
list.add(mClipData.getItemAt(i).getUri());
}
putExtra(EXTRA_STREAM, list);
}
}
}
/**