Merge "Redact cellIdentity from logs since it's PII." into sc-dev

2021-04-24 03:46:44 +00:00
parent 7edccec5c6 02523f5cec
commit 7a2b2a868e
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -2072,7 +2072,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {

    private void notifyCellLocationForSubscriber(int subId, CellIdentity cellIdentity,
            boolean hasUserSwitched) {
-        log("notifyCellLocationForSubscriber: subId=" + subId + " cellIdentity=" + cellIdentity);
+        log("notifyCellLocationForSubscriber: subId=" + subId + " cellIdentity="
+                + Rlog.pii(DBG || VDBG || DBG_LOC, cellIdentity));
        if (!checkNotifyPermission("notifyCellLocation()")) {
            return;
        }