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

Commit 140eada4 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Enterprise NetworkAgent should also have INTERNET capability." into sc-dev

parents 61981d7a 8c62c7b5

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+5 −4
Original line number Diff line number Diff line
@@ -1928,12 +1928,13 @@ public class DataConnection extends StateMachine { 
            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        }



        if (NetworkCapabilitiesUtils.inferRestrictedCapability(builder.build())) {

            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        }



        if (mEnterpriseUse) {

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_ENTERPRISE);

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        }



        if (NetworkCapabilitiesUtils.inferRestrictedCapability(builder.build())) {

            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        }



        if (mMmsUseOnly) {

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ public class DataConnectionTest extends TelephonyTest { 


        assertFalse("capabilities: " + getNetworkCapabilities(), getNetworkCapabilities()

                .hasCapability(NetworkCapabilities.NET_CAPABILITY_DUN));

        assertFalse("capabilities: " + getNetworkCapabilities(), getNetworkCapabilities()

        assertTrue("capabilities: " + getNetworkCapabilities(), getNetworkCapabilities()

                .hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET));

        assertFalse("capabilities: " + getNetworkCapabilities(), getNetworkCapabilities()

                .hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL));