Merge "Use ComponentName.flattenToShortString" into master-nova
diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index d0697ad..024d7d4 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -139,9 +139,11 @@
/** {@inheritDoc} */
@Override public String toString() {
- return String.format(Locale.US, "[%s, %s, %s]", mState,
- mCallService == null ? "<null>" : mCallService.getComponentName(),
- Log.piiHandle(mHandle));
+ String component = null;
+ if (mCallService != null && mCallService.getComponentName() != null) {
+ component = mCallService.getComponentName().flattenToShortString();
+ }
+ return String.format(Locale.US, "[%s, %s, %s]", mState, component, Log.piiHandle(mHandle));
}
CallState getState() {