summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2020-08-13 17:05:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-13 17:05:33 +0000
commitbbd2d67e87276036e8c1f13fb594b7c28e79dbc7 (patch)
tree81c2f977080dbe6978cc87013e7dd7546f515374
parent0263d0ddee64fd07a045007d4f37f1719379f5fc (diff)
parente000df714d8ad221cf55ca9ab411af9f3afcb11c (diff)
Merge "Remove IMS call logs that may leak PII" into rvc-qpr-dev am: e000df714d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12366057 Change-Id: I04c9f9cbf81ec87cea268bd2c6eb6af7254ec25f
-rw-r--r--telephony/java/android/telephony/ims/ImsConferenceState.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/ims/ImsConferenceState.java b/telephony/java/android/telephony/ims/ImsConferenceState.java
index 21bef001efae..9bf2f44395c4 100644
--- a/telephony/java/android/telephony/ims/ImsConferenceState.java
+++ b/telephony/java/android/telephony/ims/ImsConferenceState.java
@@ -203,10 +203,10 @@ public final class ImsConferenceState implements Parcelable {
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(", ");
}