scrub pii in imsphoneconnection + code cleanup

bug: 30368127
Change-Id: I14e8e6de97543786cc7dd327fe4a79f8968ecf04

1 files changed, 1 insertions, 3 deletions

diff --git a/src/java/com/android/internal/telephony/cdma/sms/BearerData.java b/src/java/com/android/internal/telephony/cdma/sms/BearerData.java
index 89c1522dfca9..1de72dbf2829 100644
--- a/src/java/com/android/internal/telephony/cdma/sms/BearerData.java
+++ b/src/java/com/android/internal/telephony/cdma/sms/BearerData.java
@@ -22,7 +22,6 @@ import android.telephony.cdma.CdmaSmsCbProgramData;
 import android.telephony.cdma.CdmaSmsCbProgramResults;
 import android.text.format.Time;
 import android.telephony.Rlog;
-import android.util.Log;
 
 import com.android.internal.telephony.GsmAlphabet;
 import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
@@ -436,8 +435,7 @@ public final class BearerData {
         builder.append(", readAckReq=" + readAckReq);
         builder.append(", reportReq=" + reportReq);
         builder.append(", numberOfMessages=" + numberOfMessages);
-        builder.append(", callbackNumber=" +
-                (Rlog.isLoggable(LOG_TAG, Log.DEBUG) ? callbackNumber : "XXX"));
+        builder.append(", callbackNumber=" + Rlog.pii(LOG_TAG, callbackNumber));
         builder.append(", depositIndex=" + depositIndex);
         builder.append(", hasUserDataHeader=" + hasUserDataHeader);
         builder.append(", userData=" + userData);