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

Commit 890e0ad4 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Fix issue where conference gets logged when no CEP is enabled." am: 603547b0 

am: 9abf7839

Change-Id: Ie48f8be6ca1b35c93f40430f91fb323fea238d02
parents 2fc1bb53 9abf7839

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 */));

    }