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

Commit ece573f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "change condition isPhoneInVoiceCall for added call" am: f1f81e2e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2037984



Change-Id: Ib9d29c96356a9f8ea0f104c3f6508533bd30465f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ec81f51 f1f81e2e

src/java/com/android/internal/telephony/data/PhoneSwitcher.java

+1 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ public class PhoneSwitcher extends Handler { 
        // in network (DIALING -> ALERTING).

        return (phone.getForegroundCall().getState() == Call.State.ACTIVE

                || phone.getForegroundCall().getState() == Call.State.ALERTING

                || phone.getBackgroundCall().getState() == Call.State.HOLDING);

                || !phone.getBackgroundCall().isIdle());

    }



    private void updateHalCommandToUse() {

tests/telephonytests/src/com/android/internal/telephony/data/PhoneSwitcherTest.java

+4 −0
Original line number Diff line number Diff line
@@ -151,6 +151,10 @@ public class PhoneSwitcherTest extends TelephonyTest { 
        doReturn(Call.State.IDLE).when(mInactiveCall).getState();

        doReturn(Call.State.HOLDING).when(mHoldingCall).getState();



        doReturn(true).when(mInactiveCall).isIdle();

        doReturn(false).when(mActiveCall).isIdle();

        doReturn(false).when(mHoldingCall).isIdle();



        replaceInstance(Phone.class, "mCi", mPhone, mCommandsInterface0);

        replaceInstance(Phone.class, "mCi", mPhone2, mCommandsInterface1);

    }