commit dcd64263edae0a5a9a1b9c3d4543bfb7f138639a
author Sailesh Nepal <sail@google.com> Fri May 23 17:03:28 2014 -0700
committer Sailesh Nepal <sail@google.com> Fri May 23 17:22:38 2014 -0700
tree 4a8f88d034a096d20f337a232c73f85fe97cb0da
parent 61ea3818009fea3090c582c770c23d46697e5b3c

Temp fix for handoff on CDMA

With this CL we no longer disconnect the WiFi call when doing
a handoff from WiFi to to CDMA. Since CDMA becomes active
quickly, disconnecting the WiFi call will end the call and stop
handoff.

This is a temp fix. I'll implement a proper fix when we switch
to daisy chaining.

Bug: 15019557
Change-Id: I6e5d21bafd41948c8bd429740e36f31ab81deadc

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index b21be69..bfeea49 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -605,8 +605,9 @@
         handoffCall.removeListener(this);
 
         if (wasSuccessful) {
-            // Disconnect.
-            originalCall.disconnect();
+            if (TelephonyUtil.isCurrentlyPSTNCall(originalCall)) {
+                originalCall.disconnect();
+            }
 
             // Synchronize.
             originalCall.setCallService(handoffCall.getCallService(), handoffCall);