commit 46ca1fbadbe11ac237652c231e6254f672142852
author Ravindra <c_rthat@codeaurora.org> Wed Dec 16 15:23:20 2015 +0530
committer Dirk Rettschlag <dirk.rettschlag@gmail.com> Fri Mar 11 23:11:16 2016 +0100
tree 02d8fbac93a743e230736ac99ce21cdc10fbf632
parent 1e726fe71e7dca1d221c7012f60599d37e0aa867

Fix to answer call in DSDS mode.

Reset the mCall reference to null when a call is disconnected
only if the disconnected call matches the call present in mcall.

Change-Id: I89dbcfcde1ed313ab7ba859b30bf55aec7555e96
CRs-Fixed: 945977

src/com/android/incallui/AnswerPresenter.java

diff --git a/src/com/android/incallui/AnswerPresenter.java b/src/com/android/incallui/AnswerPresenter.java
index 814dcf7..b0619b1 100644
--- a/src/com/android/incallui/AnswerPresenter.java
+++ b/src/com/android/incallui/AnswerPresenter.java
@@ -275,7 +275,9 @@
     public void onDisconnect(Call call) {
         int subId = call.getSubId();
         int phoneId = mCalls.getPhoneId(subId);
-        mCall[phoneId] = null;
+        if (call.equals(mCall[phoneId])) {
+            mCall[phoneId] = null;
+        }
     }
 
     public void onSessionModificationStateChange(int sessionModificationState) {
@@ -330,7 +332,7 @@
         int phoneId = mCalls.getPhoneId(subId);
         mCallId[phoneId] = call.getId();
         mCall[phoneId] = call;
-
+        mCalls.addListener(this);
         // Listen for call updates for the current call.
         mCalls.addCallUpdateListener(mCallId[phoneId], this);