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

Commit e8a5380b authored by Jack Yu's avatar Jack Yu
Browse files

Fixed VCN network was not treated as internet 

VCN network does not have NOT_VCN_MANAGED capability, so it
was not treated as internet. That caused data stall recovery
not able to perform when VCN is turned on.

Test: Basic testing + atest DataNetworkControllerTest
Fix: 233916204
Merged-In: I071197ca98c88cb12ada3df10679f4a059a4bc2f
Change-Id: I071197ca98c88cb12ada3df10679f4a059a4bc2f
parent a7ab4c7d

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

+0 −2
Original line number Diff line number Diff line
@@ -2985,8 +2985,6 @@ public class DataNetwork extends StateMachine { 
                        NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_TRUSTED)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_NOT_VPN);

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -2246,15 +2246,13 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        mDataNetworkControllerUT.addNetworkRequest(tnr);

        processAllMessages();



        // VCN managed network won't trigger onInternetDataNetworkConnected.

        // DataNetwork.isInternetSupported() is false for VCN managed network.

        verify(mMockedDataNetworkControllerCallback, never())

        verify(mMockedDataNetworkControllerCallback)

                .onInternetDataNetworkConnected(any());

        List<DataNetwork> dataNetworks = getDataNetworks();

        assertThat(dataNetworks).hasSize(1);

        assertThat(dataNetworks.get(0).getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)).isFalse();

        assertThat(dataNetworks.get(0).isInternetSupported()).isFalse();

        assertThat(dataNetworks.get(0).isInternetSupported()).isTrue();

        assertThat(dataNetworks.get(0).getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_INTERNET)).isTrue();

    }