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

Commit c3ac42cc 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

Change-Id: I19ba552f829a7d4a28610216305ff8e686870ca5
parents 3a2e3227 0b800170
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -223,10 +223,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);
        }
        // 5) An external call
        if (call.isExternalCall()) {