commit 3c385651c48c38a1c657ba915a4431ce4f58563f
author Chen Xu <fionaxu@google.com> Tue May 21 17:28:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 21 17:28:40 2019 +0000
tree a1f77afe0e53dfef575e7ffa42d0f0a32a125962
parent e6db9b86d9d79737123156030d6d89a0923eb719
parent 720da9bff0c9465cdf1f9e20ae2b02bcc08a23b7

Merge "do not print phone number which is considered as pii" into qt-dev

telephony/java/android/telephony/SubscriptionInfo.java

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index f31ac2e..1e6cd47 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -735,7 +735,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)