Merge "Fix the missing call log"
diff --git a/src/com/android/server/telecom/CallLogManager.java b/src/com/android/server/telecom/CallLogManager.java
index 23e354c..36c4951 100755
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -212,7 +212,10 @@
// Conference children connections only have CAPABILITY_DISCONNECT_FROM_CONFERENCE.
// Log them when they are disconnected from conference.
return Connection.can(call.getConnectionCapabilities(),
- Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE);
+ Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE)
+ // Sometimes conference participants don't look like merged due to special
+ // carrier requirements, e.g. could be one active and the other on hold.
+ || oldState == CallState.ACTIVE || oldState == CallState.ON_HOLD;
}
// 5) An external call
if (call.isExternalCall()) {
