From c33a47fece0202ce21fa74ae95b0f922e34061ad Mon Sep 17 00:00:00 2001
From: chen xu <fionaxu@google.com>
Date: Thu, 28 Mar 2019 16:28:45 -0700
Subject: [PATCH] scrub pii (imsi) from carrierIdentifier logging

Bug: 129229239
Test: Manual
Change-Id: I642d60e4ba1001bfd481aada87fa08dbd19098be
(cherry picked from commit 61b2c86719b0d599a2ecde8aeaa4369167e893cf)
Merged-in: I642d60e4ba1001bfd481aada87fa08dbd19098be
---
 core/java/android/service/carrier/CarrierIdentifier.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/service/carrier/CarrierIdentifier.java b/core/java/android/service/carrier/CarrierIdentifier.java
index 3b71aa740fc0..4b3e7d370185 100644
--- a/core/java/android/service/carrier/CarrierIdentifier.java
+++ b/core/java/android/service/carrier/CarrierIdentifier.java
@@ -20,6 +20,7 @@ import android.annotation.NonNull;
 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 @@ public class CarrierIdentifier implements Parcelable {
               + "mcc=" + mMcc
               + ",mnc=" + mMnc
               + ",spn=" + mSpn
-              + ",imsi=" + mImsi
+              + ",imsi=" + Rlog.pii(false, mImsi)
               + ",gid1=" + mGid1
               + ",gid2=" + mGid2
               + ",carrierid=" + mCarrierId
-- 
2.11.0