commit 225c3aa0e08b082a0b6db6cb8f65a0cef0bc00fd
author Tyler Gunn <tgunn@google.com> Tue Jul 28 15:07:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 15:07:02 2015 +0000
tree affd2f639fd8e81a4c4cfb541ce4383f5e9e29aa
parent 87f8b678b79b590ba363978f56e27f955d5f96e8
parent 8f2998ddb5bb1046f5f1f914927289a0a2c18412

Merge "Ensure original connection extras are propagated to telecom." into mnc-dr-dev

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 6c25fc1..afe92bf 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -580,7 +580,7 @@
     void setOriginalConnection(com.android.internal.telephony.Connection originalConnection) {
         Log.v(this, "new TelephonyConnection, originalConnection: " + originalConnection);
         clearOriginalConnection();
-
+        mOriginalConnectionExtras.clear();
         mOriginalConnection = originalConnection;
         getPhone().registerForPreciseCallStateChanged(
                 mHandler, MSG_PRECISE_CALL_STATE_CHANGED, null);
@@ -754,6 +754,14 @@
                     }
                     mOriginalConnectionExtras.clear();
                     mOriginalConnectionExtras.putAll(extras);
+
+                    // Ensure extras are propagated to Telecom.
+                    Bundle connectionExtras = getExtras();
+                    if (connectionExtras == null) {
+                        connectionExtras = new Bundle();
+                    }
+                    connectionExtras.putAll(mOriginalConnectionExtras);
+                    setExtras(connectionExtras);
                 } else {
                     Log.d(this, "Extras update not required");
                 }