Commit b994f53a authored Aug 06, 2020 by Grace Jia

Add Connection#EXTRA_ORIGINAL_CONNECTION_ID extra in the

ConnectionRequest when creating an conference.

This is to make sure CTS tests works well since we can only access
created Conference object by overriding
ConnectionService#onCreateIncomingConference and
ConnectionService#onCreateOutgoingConference. Extra added after these
methods cannot properly changed the MockConference instances in CTS
tests.

Bug: 159944852
Test: atest CtsTelecomTestCases:RemoteConferenceTest
Change-Id: I69bf51feec4b3506b728077aa5bf2039ce633a9b

parent 68518e59

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1199,6 +1199,10 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		mPendingResponses.put(callId, response);

		Bundle extras = call.getIntentExtras();
		if (extras == null) {
		extras = new Bundle();
		}
		extras.putString(Connection.EXTRA_ORIGINAL_CONNECTION_ID, callId);

		Log.addEvent(call, LogUtils.Events.START_CONFERENCE,
		Log.piiHandle(call.getHandle()));