Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44b5e338 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "scrub pii (imsi) from carrierIdentifier logging" 

am: 7871659f

Change-Id: I1db6ee51e908d1e777981798bee78225aa795ee9
parents ab98e503 7871659f

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

+2 −1
Original line number Diff line number Diff line
@@ -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