commit dc553ddc2d910abbc11c935e279f107a074e9e6e
author Grace Jia <xiaotonj@google.com> Thu Aug 13 18:06:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 13 18:06:19 2020 +0000
tree 75f5c6ad80d359a4071fd77f264a7bd1411e0fa8
parent 7a9d64d9c5642e5853a74d41c7478abc2d200bea
parent b994f53acfa1503ec57e64b3d0b197e751745d6f

Merge "Add Connection#EXTRA_ORIGINAL_CONNECTION_ID extra in the ConnectionRequest when creating an conference."

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

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index 8409a4c..7bd5376 100755
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -1205,6 +1205,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()));