Merge "Fixed corner case when handover fails"

am: c49627019d

Change-Id: Ib343b1ff081fa6fb4c6e51481e89eb43967143b8

1 files changed, 8 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java b/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java
index 9f1d34fd16..d86e6763d9 100644
--- a/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java
+++ b/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java
@@ -392,8 +392,14 @@ public class TelephonyNetworkFactory extends NetworkFactory {
         int originTransport = (targetTransport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
                 ? AccessNetworkConstants.TRANSPORT_TYPE_WLAN
                 : AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
-        releaseNetworkInternal(networkRequest, DcTracker.RELEASE_TYPE_HANDOVER,
-                originTransport);
+        int releaseType = success
+                ? DcTracker.RELEASE_TYPE_HANDOVER
+                // If handover fails, we need to tear down the existing connection, so the
+                // new data connection can be re-established on the new transport. If we leave
+                // the existing data connection in current transport, then DCT and qualified
+                // network service will be out of sync.
+                : DcTracker.RELEASE_TYPE_NORMAL;
+        releaseNetworkInternal(networkRequest, releaseType, originTransport);
         mNetworkRequests.put(networkRequest, targetTransport);
 
         handoverParams.callback.onCompleted(success);