Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61d755d8 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Add IS_REMOTE extra for ClipData"

parents 3ed54cd0 6de38c88

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9268,6 +9268,7 @@ package android.content { 
    field public static final int CLASSIFICATION_NOT_COMPLETE = 1; // 0x1

    field public static final int CLASSIFICATION_NOT_PERFORMED = 2; // 0x2

    field @NonNull public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;

    field public static final String EXTRA_IS_REMOTE_DEVICE = "android.content.extra.IS_REMOTE_DEVICE";

    field public static final String EXTRA_IS_SENSITIVE = "android.content.extra.IS_SENSITIVE";

    field public static final String MIMETYPE_TEXT_HTML = "text/html";

    field public static final String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";

core/java/android/content/ClipDescription.java

+10 −3
Original line number Diff line number Diff line
@@ -139,21 +139,28 @@ public class ClipDescription implements Parcelable { 
     * password or credit card number.

     * <p>

     * Type: boolean

     * </p>

     * <p>

     * This extra can be used to indicate that a ClipData contains sensitive information that

     * should be redacted or hidden from view until a user takes explicit action to reveal it

     * (e.g., by pasting).

     * </p>

     * <p>

     * Adding this extra does not change clipboard behavior or add additional security to

     * the ClipData. Its purpose is essentially a rendering hint from the source application,

     * asking that the data within be obfuscated or redacted, unless the user has taken action

     * to make it visible.

     * </p>

     */

    public static final String EXTRA_IS_SENSITIVE = "android.content.extra.IS_SENSITIVE";



    /** Indicates that a ClipData's source is a remote device.

     * <p>

     *     Type: boolean

     * <p>

     *     This extra can be used to indicate that a ClipData comes from a separate device rather

     *     than being local. It is a rendering hint that can be used to take different behavior

     *     based on the source device of copied data.

     */

    public static final String EXTRA_IS_REMOTE_DEVICE = "android.content.extra.IS_REMOTE_DEVICE";



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value =