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

Commit 603547b0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix issue where conference gets logged when no CEP is enabled."

parents 8ec18eb9 0fa8b711

src/com/android/server/telecom/CallLogManager.java

+8 −0
Original line number Diff line number Diff line
@@ -215,6 +215,14 @@ public final class CallLogManager extends CallsManagerListenerBase { 
            return false;

        }



        // A conference call which had no children should not be logged; this case will occur on IMS

        // when no conference event package data is received.  We will have logged the participants

        // as they merge into the conference, so we should not log the conference itself.

        if (call.isConference() && !call.hadChildren() &&

                !call.hasProperty(Connection.PROPERTY_REMOTELY_HOSTED)) {

            return false;

        }



        // A child call of a conference which was remotely hosted; these didn't originate on this

        // device and should not be logged.

        if (call.getParentCall() != null && call.hasProperty(Connection.PROPERTY_REMOTELY_HOSTED)) {

tests/src/com/android/server/telecom/tests/CallLogManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ public class CallLogManagerTest extends TelecomTestCase { 


    @SmallTest

    @Test

    public void testLogConferenceWithNoChildren() {

    public void testDoNotLogConferenceWithNoChildren() {

        Call fakeCall = makeFakeCall(

                DisconnectCause.LOCAL, // disconnectCauseCode

                true, // isConference
@@ -808,7 +808,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
        );

        when(fakeCall.hadChildren()).thenReturn(false);



        assertTrue(mCallLogManager.shouldLogDisconnectedCall(fakeCall, CallState.DISCONNECTED,

        assertFalse(mCallLogManager.shouldLogDisconnectedCall(fakeCall, CallState.DISCONNECTED,

                false /* isCanceled */));

    }