commit 44b5e3389f42d54bb62f07feecc8c1a8b6f13d2e
author Chen Xu <fionaxu@google.com> Wed Apr 03 19:09:51 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 19:09:51 2019 -0700
tree 3986a0c8ae842a8916841a2e38ea2cea471c9133
parent ab98e503be2cde93abb4647fe81e440273156440
parent 7871659f67441e1469b61eacb8648dfabad046b8

Merge "scrub pii (imsi) from carrierIdentifier logging"
am: 7871659f67

Change-Id: I1db6ee51e908d1e777981798bee78225aa795ee9

core/java/android/service/carrier/CarrierIdentifier.java

diff --git a/core/java/android/service/carrier/CarrierIdentifier.java b/core/java/android/service/carrier/CarrierIdentifier.java
index 3b71aa7..4b3e7d3 100644
--- a/core/java/android/service/carrier/CarrierIdentifier.java
+++ b/core/java/android/service/carrier/CarrierIdentifier.java
@@ -20,6 +20,7 @@
 import android.annotation.Nullable;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.telephony.Rlog;
 import android.telephony.TelephonyManager;
 
 import com.android.internal.telephony.uicc.IccUtils;
@@ -223,7 +224,7 @@
               + "mcc=" + mMcc
               + ",mnc=" + mMnc
               + ",spn=" + mSpn
-              + ",imsi=" + mImsi
+              + ",imsi=" + Rlog.pii(false, mImsi)
               + ",gid1=" + mGid1
               + ",gid2=" + mGid2
               + ",carrierid=" + mCarrierId