| commit | a60ba340403fc7c4be726059da3ecf9a77fee429 | [log] [tgz] |
|---|---|---|
| author | Rambo Wang <rambowang@google.com> | Mon Feb 14 20:23:01 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 14 20:23:01 2022 +0000 |
| tree | b680f2086c3f0b5b1ff9378c4fa0e64e77f64a36 | |
| parent | 81307e2146ae0d404a594ff774491c049ee7fe56 [diff] | |
| parent | 8fd6876e14653dc08b8fedaeadc7f02f45a0264f [diff] |
Merge "Support SID/NID redaction in ServiceState" am: 8fd6876e14 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1978546 Change-Id: I8bc85872b85f4389aa91879f6b5717976bf5470b
diff --git a/src/com/android/phone/ServiceStateProvider.java b/src/com/android/phone/ServiceStateProvider.java index 6f5fcf5..50f90b1 100644 --- a/src/com/android/phone/ServiceStateProvider.java +++ b/src/com/android/phone/ServiceStateProvider.java
@@ -700,8 +700,6 @@ /* package */ static ServiceState getLocationRedactedServiceState(ServiceState serviceState) { ServiceState ss = serviceState.createLocationInfoSanitizedCopy(true /*removeCoarseLocation*/); - // TODO(b/188061647): remove the additional redaction once it is fixed in SS - ss.setCdmaSystemAndNetworkId(ServiceState.UNKNOWN_ID, ServiceState.UNKNOWN_ID); return ss; } }