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

Commit 7be2c2fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check Pco when network disconnects" into main

parents 033fe94c e2f9483e

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

+1 −0
Original line number Diff line number Diff line
@@ -3391,6 +3391,7 @@ public class DataNetworkController extends Handler { 
        mPendingImsDeregDataNetworks.remove(dataNetwork);

        mDataRetryManager.cancelPendingHandoverRetry(dataNetwork);

        if (dataNetwork.isInternetSupported()) updateOverallInternetDataState();

        onPcoDataChanged(dataNetwork);



        if (dataNetwork.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_IMS)) {

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

+7 −0
Original line number Diff line number Diff line
@@ -3915,6 +3915,13 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        processAllMessages();



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



        // Deactivate the data, verify notify PCO gone.

        mDataNetworkControllerUT.tearDownAllDataNetworks(

                DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON);

        processAllFutureMessages();



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

    }



    @Test