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

Commit 047ebfb9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip teardown if handover is no longer needed" into tm-qpr-dev am: 0611a83a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20307161



Change-Id: I8fa5d2e6bccb9dd253edd59293a652e70f4cc6e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f3cff72 0611a83a

src/java/com/android/internal/telephony/data/DataNetworkController.java

+10 −0
Original line number Diff line number Diff line
@@ -2868,6 +2868,16 @@ public class DataNetworkController extends Handler { 
        } else if (handoverFailureMode == DataCallResponse

                .HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL || handoverFailureMode

                == DataCallResponse.HANDOVER_FAILURE_MODE_LEGACY) {

            int preferredTransport = mAccessNetworksManager

                    .getPreferredTransportByNetworkCapability(

                            dataNetwork.getApnTypeNetworkCapability());

            if (dataNetwork.getTransport() == preferredTransport) {

                log("onDataNetworkHandoverFailed: Already on preferred transport "

                        + AccessNetworkConstants.transportTypeToString(preferredTransport)

                        + ". No further actions needed.");

                return;

            }



            int targetTransport = DataUtils.getTargetTransport(dataNetwork.getTransport());

            mDataRetryManager.evaluateDataSetupRetry(dataNetwork.getDataProfile(), targetTransport,

                    dataNetwork.getAttachedNetworkRequestList(), cause, retryDelayMillis);

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+41 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertWithMessage; 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertSame;

import static org.junit.Assert.assertThrows;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;
@@ -1952,7 +1953,6 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        updateTransport(NetworkCapabilities.NET_CAPABILITY_IMS,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);





        // Before setup data call response, change the preference back to IWLAN.

        updateTransport(NetworkCapabilities.NET_CAPABILITY_IMS,

                AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
@@ -1973,6 +1973,46 @@ public class DataNetworkControllerTest extends TelephonyTest { 
                any(), any(), anyBoolean(), messageCaptor.capture());

    }



    @Test

    public void testHandoverDataNetworkBackToBackPreferenceChangedHandoverFail() throws Exception {

        testSetupImsDataNetwork();

        DataNetwork dataNetwork = getDataNetworks().get(0);



        Mockito.reset(mMockedWlanDataServiceManager);

        updateTransport(NetworkCapabilities.NET_CAPABILITY_IMS,

                AccessNetworkConstants.TRANSPORT_TYPE_WLAN);



        // Capture the message for setup data call response. We want to delay it.

        ArgumentCaptor<Message> messageCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mMockedWlanDataServiceManager).setupDataCall(anyInt(), any(DataProfile.class),

                anyBoolean(), anyBoolean(), anyInt(), any(), anyInt(), any(), any(), anyBoolean(),

                messageCaptor.capture());



        // Before setup data call response, change the preference back to cellular.

        updateTransport(NetworkCapabilities.NET_CAPABILITY_IMS,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);



        // Finally handover is completed.

        Message msg = messageCaptor.getValue();

        DataCallResponse response = new DataCallResponse.Builder()

                .setCause(DataFailCause.ERROR_UNSPECIFIED)

                .setRetryDurationMillis(123)

                .setHandoverFailureMode(

                        DataCallResponse.HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL)

                .build();

        msg.getData().putParcelable("data_call_response", response);

        msg.arg1 = DataServiceCallback.RESULT_ERROR_UNSUPPORTED;

        msg.sendToTarget();

        processAllMessages();



        // Make sure handover request is only sent once.

        verify(mMockedWlanDataServiceManager, times(1)).setupDataCall(anyInt(),

                any(DataProfile.class), anyBoolean(), anyBoolean(), anyInt(), any(), anyInt(),

                any(), any(), anyBoolean(), messageCaptor.capture());

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);

        assertSame(dataNetwork, getDataNetworks().get(0));

    }



    @Test

    public void testHandoverDataNetworkNotAllowedByPolicy() throws Exception {

        mCarrierConfig.putStringArray(CarrierConfigManager.KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY,