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

Commit 3a6cf48b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Fixed network request not detached from data network am: 1907a69a 

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



Change-Id: Ic260f8847bdb43dc3dc2a5ecda04ac576332ae5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d202508 1907a69a

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

+13 −5
Original line number Diff line number Diff line
@@ -1993,16 +1993,24 @@ public class DataNetworkController extends Handler { 
        sendMessage(obtainMessage(EVENT_REMOVE_NETWORK_REQUEST, networkRequest));

    }



    private void onRemoveNetworkRequest(@NonNull TelephonyNetworkRequest networkRequest) {

    private void onRemoveNetworkRequest(@NonNull TelephonyNetworkRequest request) {

        // The request generated from telephony network factory does not contain the information

        // the original request has, for example, attached data network. We need to find the

        // original one.

        TelephonyNetworkRequest networkRequest = mAllNetworkRequestList.stream()

                .filter(r -> r.equals(request))

                .findFirst()

                .orElse(null);

        if (networkRequest == null || !mAllNetworkRequestList.remove(networkRequest)) {

            loge("onRemoveNetworkRequest: Network request does not exist. " + networkRequest);

            return;

        }



        if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_IMS)) {

            mImsThrottleCounter.addOccurrence();

            mLastReleasedImsRequestCapabilities = networkRequest.getCapabilities();

            mLastImsOperationIsRelease = true;

        }

        if (!mAllNetworkRequestList.remove(networkRequest)) {

            loge("onRemoveNetworkRequest: Network request does not exist. " + networkRequest);

            return;

        }



        if (networkRequest.getAttachedNetwork() != null) {

            networkRequest.getAttachedNetwork().detachNetworkRequest(networkRequest);

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

+26 −0
Original line number Diff line number Diff line
@@ -2888,4 +2888,30 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS,

                NetworkCapabilities.NET_CAPABILITY_MMTEL);

    }



    @Test

    public void testRemoveNetworkRequest() throws Exception {

        NetworkCapabilities netCaps = new NetworkCapabilities();

        netCaps.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        NetworkRequest nativeNetworkRequest = new NetworkRequest(netCaps,

                ConnectivityManager.TYPE_MOBILE, 0, NetworkRequest.Type.REQUEST);



        mDataNetworkControllerUT.addNetworkRequest(new TelephonyNetworkRequest(

                nativeNetworkRequest, mPhone));

        processAllMessages();



        // Intentionally create a new telephony request with the original native network request.

        TelephonyNetworkRequest request = new TelephonyNetworkRequest(nativeNetworkRequest, mPhone);



        mDataNetworkControllerUT.removeNetworkRequest(request);

        processAllFutureMessages();



        List<DataNetwork> dataNetworkList = getDataNetworks();

        // The data network should not be torn down after network request removal.

        assertThat(dataNetworkList).hasSize(1);

        // But should be detached from the data network.

        assertThat(dataNetworkList.get(0).getAttachedNetworkRequestList()).isEmpty();

        assertThat(dataNetworkList.get(0).isConnected()).isTrue();

    }

}