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

Commit 7b9caeb0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I832ddcc8,Id54258d0 am: e71fb947 

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



Change-Id: Ibb36e32c794c1621b01d719c8a799d0e327e2441
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99f6e78b e71fb947

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

+1 −1
Original line number Diff line number Diff line
@@ -3283,7 +3283,7 @@ public class DataNetwork extends StateMachine { 
                || mCid.get(mTransport) == INVALID_CID) {

            return Collections.emptyMap();

        }

        return mPcoData.get(mCid.get(mTransport));

        return mPcoData.getOrDefault(mCid.get(mTransport), Collections.emptyMap());

    }



    /**

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

+14 −0
Original line number Diff line number Diff line
@@ -2461,6 +2461,20 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        verify(mMockedDataNetworkControllerCallback).onNrAdvancedCapableByPcoChanged(eq(true));

    }



    @Test

    public void testNrAdvancedByPcoMultipleNetworks() throws Exception {

        testSetupDataNetwork();

        setSuccessfulSetupDataResponse(mMockedDataServiceManagers

                .get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), 2);

        testSetupImsDataNetwork();



        verify(mMockedDataNetworkControllerCallback, never())

                .onNrAdvancedCapableByPcoChanged(anyBoolean());

        mSimulatedCommands.triggerPcoData(2, "IPV6", 1234, new byte[]{1});

        processAllMessages();

        verify(mMockedDataNetworkControllerCallback).onNrAdvancedCapableByPcoChanged(eq(true));

    }



    @Test

    public void testNrAdvancedByEarlyUnrelatedPco() {

        Mockito.reset(mMockedWwanDataServiceManager);