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

Commit 7c81db14 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Fixed VCN network was not treated as internet" into tm-d1-dev am: b1848411 

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



Change-Id: Ibe484f56643de593a88f826080a8a86c1cc8abc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d58882a b1848411

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

+0 −2
Original line number Diff line number Diff line
@@ -2981,8 +2981,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
@@ -2315,15 +2315,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();

    }