Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a293d43 authored by Jack Yu's avatar Jack Yu
Browse files

IWLAN handover fix 

Explicitly tear down the data connection on the
source transort when handover failed with non-fallback
fail cause. Explicitly tearing it down without waiting
for connectivity service calling unwanted (which will not
happen because the network request is not removed).

Fix: 155079915
Test: Telephony sanity tests
Change-Id: I02f22d8d11661a7e938177c3ca4968202fe00e44
parent 7c379133

src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java

+6 −2
Original line number Diff line number Diff line
@@ -406,8 +406,12 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
                    // 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;

                    // network service will be out of sync. Specifying release type to detach

                    // the transport is moved to the other transport, but network request is still

                    // there, connectivity service will not call unwanted to tear down the network.

                    // We need explicitly tear down the data connection here so the new data

                    // connection can be re-established on the other transport.

                    : DcTracker.RELEASE_TYPE_DETACH;

            releaseNetworkInternal(networkRequest, releaseType, originTransport);

            mNetworkRequests.put(networkRequest, targetTransport);

        }