commit cc41c0dd0a5ea2f093f520b442c132a489b184af
author Roshan Pius <rpius@google.com> Wed Sep 02 21:18:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 02 21:18:04 2015 +0000
tree f55498e3f02965805fd3e6f8fa3742ba95dd7e95
parent aa92bb8dc3327e6e9be880fd8389da8497a0e06c
parent 6b528c01d5203328bd0df0f2a55bea59fbaeb53a

am 6b528c01: am fc8883b2: Update call state for 2nd call in CDMA conference.

* commit '6b528c01d5203328bd0df0f2a55bea59fbaeb53a':
  Update call state for 2nd call in CDMA conference.

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

diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index d2250d4..d13f66f 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -192,7 +192,7 @@
         if (isDialing) {
             setDialing();
         } else {
-            updateState();
+            updateState(true);
         }
     }
 

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 50f3c38..e0556dc 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -816,13 +816,17 @@
     }
 
     void updateState() {
+       updateState(false);
+    }
+
+    void updateState(boolean force) {
         if (mOriginalConnection == null) {
             return;
         }
 
         Call.State newState = mOriginalConnection.getState();
         Log.v(this, "Update state from %s to %s for %s", mOriginalConnectionState, newState, this);
-        if (mOriginalConnectionState != newState) {
+        if (mOriginalConnectionState != newState || force) {
             mOriginalConnectionState = newState;
             switch (newState) {
                 case IDLE: