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

Commit 04639ba0 authored by David Brown's avatar David Brown
Browse files

Reduce the outrageous verbosity of CallerInfo.toString(). 

Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
parent b483d5cd

telephony/java/com/android/internal/telephony/CallerInfo.java

+35 −22
Original line number Diff line number Diff line
@@ -469,9 +469,14 @@ public class CallerInfo { 
     * @return a string debug representation of this instance.

     */

    public String toString() {

        // Warning: never check in this file with VERBOSE_DEBUG = true

        // because that will result in PII in the system log.

        final boolean VERBOSE_DEBUG = false;



        if (VERBOSE_DEBUG) {

            return new StringBuilder(384)

                .append("\nname: " + /*name*/ "nnnnnn")

                .append("\nphoneNumber: " + /*phoneNumber*/ "xxxxxxx")

                    .append("\nname: " + name)

                    .append("\nphoneNumber: " + phoneNumber)

                    .append("\ncnapName: " + cnapName)

                    .append("\nnumberPresentation: " + numberPresentation)

                    .append("\nnamePresentation: " + namePresentation)
@@ -482,8 +487,8 @@ public class CallerInfo { 
                    .append("\nphotoResource: " + photoResource)

                    .append("\nperson_id: " + person_id)

                    .append("\nneedUpdate: " + needUpdate)

                .append("\ncontactRefUri: " + /*contactRefUri*/ "xxxxxxx")

                .append("\ncontactRingtoneUri: " + /*contactRefUri*/ "xxxxxxx")

                    .append("\ncontactRefUri: " + contactRefUri)

                    .append("\ncontactRingtoneUri: " + contactRefUri)

                    .append("\nshouldSendToVoicemail: " + shouldSendToVoicemail)

                    .append("\ncachedPhoto: " + cachedPhoto)

                    .append("\nisCachedPhotoCurrent: " + isCachedPhotoCurrent)
@@ -491,5 +496,13 @@ public class CallerInfo { 
                    .append("\nvoicemail " + mIsVoiceMail)

                    .append("\ncontactExists " + contactExists)

                    .toString();

        } else {

            return new StringBuilder(128)

                    .append("CallerInfo { ")

                    .append("name " + ((name == null) ? "null" : "non-null"))

                    .append(", phoneNumber " + ((phoneNumber == null) ? "null" : "non-null"))

                    .append(" }")

                    .toString();

        }

    }

}