diff options
4 files changed, 10 insertions, 7 deletions
diff --git a/core/java/android/view/autofill/AutoFillId.java b/core/java/android/view/autofill/AutoFillId.java index 3dbf5a8b0415..38dc404ed6d3 100644 --- a/core/java/android/view/autofill/AutoFillId.java +++ b/core/java/android/view/autofill/AutoFillId.java @@ -93,11 +93,11 @@ public final class AutoFillId implements Parcelable { public String toString() { if (!DEBUG) return super.toString(); - final StringBuilder builder = new StringBuilder("FieldId [viewId=").append(mViewId); + final StringBuilder builder = new StringBuilder().append(mViewId); if (mVirtual) { - builder.append(", virtualId=").append(mVirtualId); + builder.append(":").append(mVirtualId); } - return builder.append(']').toString(); + return builder.toString(); } @Override diff --git a/core/java/android/view/autofill/AutoFillValue.java b/core/java/android/view/autofill/AutoFillValue.java index b31f4aff2b1c..af7036130cd8 100644 --- a/core/java/android/view/autofill/AutoFillValue.java +++ b/core/java/android/view/autofill/AutoFillValue.java @@ -104,8 +104,11 @@ public final class AutoFillValue implements Parcelable { public String toString() { if (!DEBUG) return super.toString(); - return "AutoFillValue[text=" + mText + ", listIndex=" + mListIndex + ", toggle=" + mToggle - + "]"; + if (mText != null) { + return mText.length() + "_chars"; + } + + return "[listIndex=" + mListIndex + ", toggle=" + mToggle + "]"; } ///////////////////////////////////// diff --git a/core/java/android/view/autofill/Helper.java b/core/java/android/view/autofill/Helper.java index a9844d7f0b47..b1c9efad6dc6 100644 --- a/core/java/android/view/autofill/Helper.java +++ b/core/java/android/view/autofill/Helper.java @@ -32,7 +32,7 @@ public final class Helper { static StringBuilder append(StringBuilder builder, Bundle bundle) { if (bundle == null) { builder.append("N/A"); - } else if (!DEBUG) { + } else if (!VERBOSE) { builder.append(REDACTED); } else { final Set<String> keySet = bundle.keySet(); diff --git a/services/autofill/java/com/android/server/autofill/Helper.java b/services/autofill/java/com/android/server/autofill/Helper.java index 7400a64c36f8..0f2bb608ead3 100644 --- a/services/autofill/java/com/android/server/autofill/Helper.java +++ b/services/autofill/java/com/android/server/autofill/Helper.java @@ -38,7 +38,7 @@ final class Helper { static void append(StringBuilder builder, Bundle bundle) { if (bundle == null) { builder.append("N/A"); - } else if (!DEBUG) { + } else if (!VERBOSE) { builder.append(REDACTED); } else { final Set<String> keySet = bundle.keySet(); |