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

Commit 964b414f authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Fixed network request was removed before retry am: 01adfe2b 

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



Change-Id: I6dc0e0b3ff37116cb4ecea7fee0499f98190a743
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4ad3266 01adfe2b

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

+8 −7
Original line number Diff line number Diff line
@@ -2440,7 +2440,7 @@ public class DataNetworkController extends Handler { 


    /**

     * Track the frequency of setup data failure on each

     * {@link AccessNetworkConstants#TransportType} data service.

     * {@link AccessNetworkConstants.TransportType} data service.

     *

     * @param transport The transport of the data service.

     */
@@ -2506,16 +2506,17 @@ public class DataNetworkController extends Handler { 
     */

    private void onDataNetworkSetupRetry(@NonNull DataSetupRetryEntry dataSetupRetryEntry) {

        // The request might be already removed before retry happens. Remove them from the list

        // if that's the case.

        dataSetupRetryEntry.networkRequestList.removeIf(

                request -> !mAllNetworkRequestList.contains(request));

        if (dataSetupRetryEntry.networkRequestList.isEmpty()) {

        // if that's the case. Copy the list first. We don't want to remove the requests from

        // the retry entry. They can be later used to determine what kind of retry it is.

        NetworkRequestList requestList = new NetworkRequestList(

                dataSetupRetryEntry.networkRequestList);

        requestList.removeIf(request -> !mAllNetworkRequestList.contains(request));

        if (requestList.isEmpty()) {

            loge("onDataNetworkSetupRetry: Request list is empty. Abort retry.");

            dataSetupRetryEntry.setState(DataRetryEntry.RETRY_STATE_CANCELLED);

            return;

        }

        TelephonyNetworkRequest telephonyNetworkRequest =

                dataSetupRetryEntry.networkRequestList.get(0);

        TelephonyNetworkRequest telephonyNetworkRequest = requestList.get(0);



        int networkCapability = telephonyNetworkRequest.getApnTypeNetworkCapability();

        int preferredTransport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(

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

+1 −1
Original line number Diff line number Diff line
@@ -1485,7 +1485,7 @@ public class DataRetryManager extends Handler { 
                        logl(msg);

                        loge("mDataRetryEntries=" + mDataRetryEntries);

                        AnomalyReporter.reportAnomaly(

                                UUID.fromString("afeab78c-c0b0-49fc-a51f-f766814d7aa5"),

                                UUID.fromString("781af571-f55d-476d-b510-7a5381f633dc"),

                                msg,

                                mPhone.getCarrierId());

                        continue;

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

+1 −2
Original line number Diff line number Diff line
@@ -1936,7 +1936,6 @@ public class DataNetworkControllerTest extends TelephonyTest { 
    public void testHandoverDataNetworkWhileSwitchTo3G() throws Exception {

        testSetupImsDataNetwork();



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

        // Before handover the data profile is the cellular IMS data profile

        verifyConnectedNetworkHasDataProfile(mImsCellularDataProfile);
@@ -1953,7 +1952,7 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        // Move the time a little bit, handover still not responded.

        moveTimeForward(500);

        processAllMessages();

        dataNetwork = getDataNetworks().get(0);

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

        // Verify the network is still on cellular, waiting for handover, although already on 3G.

        assertThat(dataNetwork.getTransport()).isEqualTo(

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);