summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-09-30 14:47:51 -0700
committerTyler Gunn <tgunn@google.com>2014-09-30 22:29:32 +0000
commit76c01a50d3028d9db251d7fc8bc5dbab1879d493 (patch)
tree1367bfdcafb205effb2ccb58ce07cdfc2d7a8752 /telecomm/java/android
parent49764d45f63955374803a4a1e092ee18bb33b1a5 (diff)
downloadframeworks_base-76c01a50d3028d9db251d7fc8bc5dbab1879d493.zip
frameworks_base-76c01a50d3028d9db251d7fc8bc5dbab1879d493.tar.gz
frameworks_base-76c01a50d3028d9db251d7fc8bc5dbab1879d493.tar.bz2
MR1 - Adding more Telecom state dumping.
- Add toString for PhoneAccount class for use when dumping state. - Call Log.pii for PhoneAccountHandle mId since it may contain pii (eg sip uri). Bug: 17730966 Change-Id: Iddbd949b42704405de558f8ed8c4449242b74870
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/PhoneAccount.java15
-rw-r--r--telecomm/java/android/telecom/PhoneAccountHandle.java4
2 files changed, 18 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index 062baa5..66b52ae 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -451,4 +451,19 @@ public class PhoneAccount implements Parcelable {
in.readList(supportedUriSchemes, classLoader);
mSupportedUriSchemes = Collections.unmodifiableList(supportedUriSchemes);
}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder().append("[PhoneAccount: ")
+ .append(mAccountHandle)
+ .append(" Capabilities: ")
+ .append(mCapabilities)
+ .append(" Schemes: ");
+ for (String scheme : mSupportedUriSchemes) {
+ sb.append(scheme)
+ .append(" ");
+ }
+ sb.append("]");
+ return sb.toString();
+ }
}
diff --git a/telecomm/java/android/telecom/PhoneAccountHandle.java b/telecomm/java/android/telecom/PhoneAccountHandle.java
index e13df76..768188b 100644
--- a/telecomm/java/android/telecom/PhoneAccountHandle.java
+++ b/telecomm/java/android/telecom/PhoneAccountHandle.java
@@ -71,9 +71,11 @@ public class PhoneAccountHandle implements Parcelable {
@Override
public String toString() {
+ // Note: Log.pii called for mId as it can contain personally identifying phone account
+ // information such as SIP account IDs.
return new StringBuilder().append(mComponentName)
.append(", ")
- .append(mId)
+ .append(Log.pii(mId))
.toString();
}