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

Commit c2f7a291 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Add IS_REMOTE extra for ClipData" into tm-qpr-dev am: 07d111f5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223086



Change-Id: I6e17daf127e59a31c597d822eb2dc045404442f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f956e3fb 07d111f5

core/java/android/content/ClipDescription.java

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

     * password or credit card number.

     * <p>

     * <p>

     * Type: boolean

     * Type: boolean

     * </p>

     * <p>

     * <p>

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

     * 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

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

     * (e.g., by pasting).

     * (e.g., by pasting).

     * </p>

     * <p>

     * <p>

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

     * 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,

     * 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

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

     * to make it visible.

     * to make it visible.

     * </p>

     */

     */

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

    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.

     * @hide

     */

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



    /** @hide */

    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value =

    @IntDef(value =