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

Commit 7c566ff6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add Extra to mark ClipData items as "sensitive"." into tm-dev am: d4dc4fbf 

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



Change-Id: I6c662a432d4b0669935923ac81fadea27b214012
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f04d31b0 d4dc4fbf

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9225,6 +9225,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_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";

    field public static final String MIMETYPE_TEXT_PLAIN = "text/plain";

core/java/android/content/ClipDescription.java

+20 −0
Original line number Diff line number Diff line
@@ -134,6 +134,26 @@ public class ClipDescription implements Parcelable { 
    public static final String EXTRA_LOGGING_INSTANCE_ID =

            "android.intent.extra.LOGGING_INSTANCE_ID";



    /**

     * Indicates that a ClipData contains potentially sensitive information, such as a

     * 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";



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value =