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
diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index 7ce5beb..77d79bb 100755
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -1199,6 +1199,10 @@
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()));