OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2cd6f24
)
scrub pii (imsi) from carrierIdentifier logging
author
chen xu
<fionaxu@google.com>
Thu, 28 Mar 2019 23:28:45 +0000
(16:28 -0700)
committer
chen xu
<fionaxu@google.com>
Thu, 4 Apr 2019 00:32:05 +0000
(17:32 -0700)
Bug:
129229239
Test: Manual
Change-Id: I642d60e4ba1001bfd481aada87fa08dbd19098be
(cherry picked from commit
61b2c86719b0d599a2ecde8aeaa4369167e893cf
)
Merged-in: I642d60e4ba1001bfd481aada87fa08dbd19098be
core/java/android/service/carrier/CarrierIdentifier.java
patch
|
blob
|
history
diff --git
a/core/java/android/service/carrier/CarrierIdentifier.java
b/core/java/android/service/carrier/CarrierIdentifier.java
index
3b71aa7
..
4b3e7d3
100644
(file)
--- 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