Merge "scrub pii (imsi) from carrierIdentifier logging"

am: 7871659f67

Change-Id: I1db6ee51e908d1e777981798bee78225aa795ee9
This commit is contained in:
Chen Xu
2019-04-03 19:09:51 -07:00
committed by android-build-merger

View File

@@ -20,6 +20,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.telephony.Rlog;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.android.internal.telephony.uicc.IccUtils; import com.android.internal.telephony.uicc.IccUtils;
@@ -223,7 +224,7 @@ public class CarrierIdentifier implements Parcelable {
+ "mcc=" + mMcc + "mcc=" + mMcc
+ ",mnc=" + mMnc + ",mnc=" + mMnc
+ ",spn=" + mSpn + ",spn=" + mSpn
+ ",imsi=" + mImsi + ",imsi=" + Rlog.pii(false, mImsi)
+ ",gid1=" + mGid1 + ",gid1=" + mGid1
+ ",gid2=" + mGid2 + ",gid2=" + mGid2
+ ",carrierid=" + mCarrierId + ",carrierid=" + mCarrierId