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

Commit 4f027491 authored by Grace Jia's avatar Grace Jia Committed by Automerger Merge Worker
Browse files

Merge "Add Connection#EXTRA_ORIGINAL_CONNECTION_ID extra in the... 

Merge "Add Connection#EXTRA_ORIGINAL_CONNECTION_ID extra in the ConnectionRequest when creating an conference." am: dc553ddc am: 08a27941

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1392889

Change-Id: Ifbb7b86f8c9215458e758ffb1047642ce0ca570c
parents df0b84fa 08a27941

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

+4 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,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()));