drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce the outrageous verbosity of CallerInfo.toString().

Browse Source 
Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
This commit is contained in:
David Brown
2010-11-30 15:31:15 -08:00
parent b483d5cd13
commit 04639ba0a9
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@ -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();
}
}
}