commit 75d127dc92490fd6a5a00876b33cb4d9c59320b7
author Brad Ebinger <breadley@google.com> Wed Aug 12 17:28:45 2020 -0700
committer Brad Ebinger <breadley@google.com> Thu Aug 13 00:41:39 2020 +0000
tree 00d23d9d3db1f905b2efe2220945bbf5c19c189a
parent 89f122abe2b752becacaa437b5c2624bf52402b6

Remove IMS call logs that may leak PII

Bug: 160389340
Test: Check logs for PII
Change-Id: I203b37d8e643c59d69aa26097d223fc4b3f8e332

telephony/java/android/telephony/ims/ImsConferenceState.java

diff --git a/telephony/java/android/telephony/ims/ImsConferenceState.java b/telephony/java/android/telephony/ims/ImsConferenceState.java
index 21bef00..9bf2f44 100644
--- a/telephony/java/android/telephony/ims/ImsConferenceState.java
+++ b/telephony/java/android/telephony/ims/ImsConferenceState.java
@@ -203,10 +203,10 @@
                     for (String key : participantData.keySet()) {
                         sb.append(key);
                         sb.append("=");
-                        if (ENDPOINT.equals(key) || USER.equals(key)) {
-                            sb.append(Rlog.pii(TAG, participantData.get(key)));
-                        } else {
+                        if (STATUS.equals(key)) {
                             sb.append(participantData.get(key));
+                        } else {
+                            sb.append(Rlog.pii(TAG, participantData.get(key)));
                         }
                         sb.append(", ");
                     }