Merge "Make headset buttons work with simulated ringing" (091fcc1b) · Commits · e / os / android_packages_services_Telecomm

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -2754,7 +2754,8 @@ public class CallsManager extends Call.ListenerBase
		@VisibleForTesting
		public boolean onMediaButton(int type) {
		if (hasAnyCalls()) {
		Call ringingCall = getFirstCallWithState(CallState.RINGING);
		Call ringingCall = getFirstCallWithState(CallState.RINGING,
		CallState.SIMULATED_RINGING);
		if (HeadsetMediaButton.SHORT_PRESS == type) {
		if (ringingCall == null) {
		Call activeCall = getFirstCallWithState(CallState.ACTIVE);
		@@ -2776,7 +2777,7 @@ public class CallsManager extends Call.ListenerBase
		return true;
		}
		} else {
		ringingCall.answer(VideoProfile.STATE_AUDIO_ONLY);
		answerCall(ringingCall, VideoProfile.STATE_AUDIO_ONLY);
		return true;
		}
		} else if (HeadsetMediaButton.LONG_PRESS == type) {

+4 −0

Original line number	Diff line number	Diff line
		@@ -894,6 +894,10 @@ public class CallsManagerTest extends TelecomTestCase {
		mCallsManager.onMediaButton(HeadsetMediaButton.SHORT_PRESS);

		// THEN the incoming call is answered
		ArgumentCaptor<CallsManager.RequestCallback> captor = ArgumentCaptor.forClass(
		CallsManager.RequestCallback.class);
		verify(mConnectionSvrFocusMgr).requestFocus(eq(incomingCall), captor.capture());
		captor.getValue().onRequestFocusDone(incomingCall);
		verify(incomingCall).answer(VideoProfile.STATE_AUDIO_ONLY);
		}