Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e61b1d87 authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Do not log the cancelled conference call" am: 0b800170

am: c3ac42cc

Change-Id: I575675f5339636a1fe7ba1eb966ee4a633f0c9ae
parents 144aad55 c3ac42cc
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -232,10 +232,7 @@ public final class CallLogManager extends CallsManagerListenerBase {
            // 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)
                    // 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;
                    Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE);
        }
        // An external call
        if (call.isExternalCall()) {