commit 43e3657696efff11ff8eb40ecb0a7364103b50f4
author Tyler Gunn <tgunn@google.com> Thu Oct 22 23:05:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 22 23:05:29 2015 +0000
tree d3dee41c01efc508c6973d52ecd62b35e83a258a
parent 1c0adee03c15bd8ebda98853f055eef1f01d85ec
parent 553db651cd5a51eedde0259d5a25e91700ef96c5

Merge "Ensure connection extras set before connection start are passed through." into mnc-dr-dev

src/java/com/android/internal/telephony/Connection.java

diff --git a/src/java/com/android/internal/telephony/Connection.java b/src/java/com/android/internal/telephony/Connection.java
index e727de5..51dfe60 100644
--- a/src/java/com/android/internal/telephony/Connection.java
+++ b/src/java/com/android/internal/telephony/Connection.java
@@ -129,6 +129,7 @@
     private int mCallSubstate;
     private android.telecom.Connection.VideoProvider mVideoProvider;
     public Call.State mPreHandoverState = Call.State.IDLE;
+    private Bundle mExtras;
 
     /* Instance Methods */
 
@@ -632,12 +633,21 @@
      * @param extras New connection extras.
      */
     public void setConnectionExtras(Bundle extras) {
+        mExtras = extras;
         for (Listener l : mListeners) {
             l.onExtrasChanged(extras);
         }
     }
 
     /**
+     * Retrieves the current connection extras.
+     * @return the connection extras.
+     */
+    public Bundle getConnectionExtras() {
+        return mExtras;
+    }
+
+    /**
      * Sets the call substate for the current connection and reports the changes to all listeners.
      * Valid call substates are defined in {@link android.telecom.Connection}.
      *

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
index 4280c27..8b72a63 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
@@ -165,6 +165,11 @@
 
         updateWifiState();
 
+        // Ensure any extras set on the ImsCallProfile at the start of the call are cached locally
+        // in the ImsPhoneConnection.  This isn't going to inform any listeners (since the original
+        // connection is not likely to be associated with a TelephonyConnection yet).
+        updateExtras(imsCall);
+
         mParent = parent;
         mParent.attach(this,
                 (mIsIncoming? ImsPhoneCall.State.INCOMING: ImsPhoneCall.State.DIALING));