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

Commit ba332aa4 authored Apr 07, 2022 by Treehugger Robot Committed by Automerger Merge Worker Apr 07, 2022

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

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

Change-Id: I8d2294c1900437f1c7878ffb180254fa6d31c344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6dbfa8ee ece573f9

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1643,7 +1643,7 @@ public class PhoneSwitcher extends Handler {
	// in network (DIALING -> ALERTING).		// in network (DIALING -> ALERTING).
	return (phone.getForegroundCall().getState() == Call.State.ACTIVE		return (phone.getForegroundCall().getState() == Call.State.ACTIVE
	\|\| phone.getForegroundCall().getState() == Call.State.ALERTING		\|\| phone.getForegroundCall().getState() == Call.State.ALERTING
	\|\| phone.getBackgroundCall().getState() == Call.State.HOLDING);		\|\| !phone.getBackgroundCall().isIdle());
	}		}

	private void updateHalCommandToUse() {		private void updateHalCommandToUse() {

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -151,6 +151,10 @@ public class PhoneSwitcherTest extends TelephonyTest {
	doReturn(Call.State.IDLE).when(mInactiveCall).getState();		doReturn(Call.State.IDLE).when(mInactiveCall).getState();
	doReturn(Call.State.HOLDING).when(mHoldingCall).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", mPhone, mCommandsInterface0);
	replaceInstance(Phone.class, "mCi", mPhone2, mCommandsInterface1);		replaceInstance(Phone.class, "mCi", mPhone2, mCommandsInterface1);
	}		}