commit 84b311d3a2de2be79ec307945335f1c637c2d00b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 17 23:33:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 23:33:41 2019 +0000
tree 13e12fa29319e55999843837f0f6240f00f50076
parent f4c10e8bc26699a7e8efaebfd0d617aca9cb7718
parent 286ca032c2d8b0a52454452a1423aedb56debeae

Merge "do not print phone number which is considered as pii"

telephony/java/android/telephony/SubscriptionInfo.java

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 70471d7..994d705 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -734,7 +734,7 @@
         return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
                 + " carrierId=" + mCarrierId + " displayName=" + mDisplayName
                 + " carrierName=" + mCarrierName + " nameSource=" + mNameSource
-                + " iconTint=" + mIconTint + " mNumber=" + mNumber
+                + " iconTint=" + mIconTint + " mNumber=" + Rlog.pii(Build.IS_DEBUGGABLE, mNumber)
                 + " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc " + mMcc
                 + " mnc " + mMnc + "mCountryIso=" + mCountryIso + " isEmbedded " + mIsEmbedded
                 + " accessRules " + Arrays.toString(mAccessRules)