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

Commit 5b2e3c25 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev am: 949b4d29 am: b8c160bd 

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

Change-Id: Ibb5a962014606950d377c4c5b1be69521559acd9
parents c595da47 b8c160bd

core/java/android/view/contentcapture/ContentCaptureEvent.java

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package android.view.contentcapture;



import static android.view.contentcapture.ContentCaptureHelper.getSanitizedString;

import static android.view.contentcapture.ContentCaptureManager.DEBUG;

import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;



import android.annotation.IntDef;
@@ -509,11 +510,13 @@ public final class ContentCaptureEvent implements Parcelable { 
            string.append(", class=").append(className);

            string.append(", id=").append(mNode.getAutofillId());

            if (mNode.getText() != null) {

                string.append(", text=").append(getSanitizedString(mNode.getText()));

                string.append(", text=")

                        .append(DEBUG ? mNode.getText() : getSanitizedString(mNode.getText()));

            }

        }

        if (mText != null) {

            string.append(", text=").append(getSanitizedString(mText));

            string.append(", text=")

                    .append(DEBUG ? mText : getSanitizedString(mText));

        }

        if (mClientContext != null) {

            string.append(", context=").append(mClientContext);

core/java/android/view/contentcapture/ContentCaptureManager.java

+3 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ public final class ContentCaptureManager { 


    private static final String TAG = ContentCaptureManager.class.getSimpleName();



    /** @hide */

    public static final boolean DEBUG = false;



    /** Error happened during the data sharing session. */

    public static final int DATA_SHARE_ERROR_UNKNOWN = 1;