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

Commit c3955e7a authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Automerger Merge Worker
Browse files

Merge "Revert "ConnectivityManager#registerNetworkAgent gains an argument""... 

Merge "Revert "ConnectivityManager#registerNetworkAgent gains an argument"" into main am: 6ea2d705

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



Change-Id: I77d85b3950423948973673a0a39c52a1d17e46a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14e9ec5c 6ea2d705

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ public class ContextFixture implements TestFixture<Context> { 
        doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString());

        doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId();

        doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent(

                any(), any(), any(), any(), any(), any(), any(), anyInt());

                any(), any(), any(), any(), any(), any(), anyInt());



        doReturn(true).when(mEuiccManager).isEnabled();

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

+13 −13
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ public class DataNetworkTest extends TelephonyTest { 


        verify(mConnectivityManager).registerNetworkAgent(any(), any(NetworkInfo.class),

                linkPropertiesCaptor.capture(), networkCapabilitiesCaptor.capture(), any(), any(),

                any(), anyInt());

                anyInt());

        // The very first link properties from telephony is an empty link properties. It will be

        // updated later.

        assertThat(linkPropertiesCaptor.getValue()).isEqualTo(new LinkProperties());
@@ -532,7 +532,7 @@ public class DataNetworkTest extends TelephonyTest { 


        verify(mConnectivityManager).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), networkCapabilitiesCaptor.capture(), any(), any(),

                any(), anyInt());

                anyInt());



        // Make sure the initial network capability has NOT_SUSPENDED

        assertThat(networkCapabilitiesCaptor.getValue().hasCapability(
@@ -596,7 +596,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent re-created, so register should be called twice.

        verify(mConnectivityManager, times(2)).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), networkCapabilitiesCaptor.capture(), any(), any(),

                any(), anyInt());

                anyInt());



        // Make sure the 2nd network agent was created with NOT_SUSPENDED.

        assertThat(networkCapabilitiesCaptor.getValue().hasCapability(
@@ -656,7 +656,7 @@ public class DataNetworkTest extends TelephonyTest { 


        verify(mConnectivityManager).registerNetworkAgent(any(), any(NetworkInfo.class),

                linkPropertiesCaptor.capture(), networkCapabilitiesCaptor.capture(), any(), any(),

                any(), anyInt());

                anyInt());

        // The very first link properties from telephony is an empty link properties. It will be

        // updated later.

        assertThat(linkPropertiesCaptor.getValue()).isEqualTo(new LinkProperties());
@@ -1287,8 +1287,8 @@ public class DataNetworkTest extends TelephonyTest { 
                .forClass(NetworkAgentConfig.class);



        verify(mConnectivityManager).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), any(),

                captor.capture(), anyInt());

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), captor.capture(),

                anyInt());



        NetworkAgentConfig networkAgentConfig = captor.getValue();
@@ -1371,7 +1371,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent re-created, so register should be called twice.

        verify(mConnectivityManager, times(2)).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());



        assertThat(mDataNetworkUT.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)).isTrue();
@@ -1393,7 +1393,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent not re-created, so register should be called once.

        verify(mConnectivityManager, times(1)).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());



        assertThat(mDataNetworkUT.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)).isTrue();
@@ -1562,7 +1562,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent re-created, so register should be called twice.

        verify(mConnectivityManager, times(2)).registerNetworkAgent(any(), any(NetworkInfo.class),

                linkPropertiesCaptor.capture(), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());

        // The new agent should have the new IP address.

        assertThat(linkPropertiesCaptor.getValue().getAllAddresses()).containsExactly(

                InetAddresses.parseNumericAddress(IPV4_ADDRESS1),
@@ -1611,7 +1611,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent re-created, so register should be called twice.

        verify(mConnectivityManager, times(2)).registerNetworkAgent(any(), any(NetworkInfo.class),

                linkPropertiesCaptor.capture(), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());

        // The new agent should have the new IP address.

        assertThat(linkPropertiesCaptor.getValue().getAllAddresses()).containsExactly(

                InetAddresses.parseNumericAddress(IPV6_ADDRESS1));
@@ -1702,7 +1702,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent should not be re-created, so register should be called ony once.

        verify(mConnectivityManager, times(1)).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());



        // The network should have IPv6 address now

        assertThat(mDataNetworkUT.getLinkProperties().getAllAddresses()).containsExactly(
@@ -1746,7 +1746,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent should not be re-created, so register should be called ony once.

        verify(mConnectivityManager, times(1)).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());



        // The network should have IPv6 address now

        assertThat(mDataNetworkUT.getLinkProperties().getAllAddresses()).containsExactly(
@@ -1791,7 +1791,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Agent should not be re-created, so register should be called ony once.

        verify(mConnectivityManager, times(1)).registerNetworkAgent(any(), any(NetworkInfo.class),

                any(LinkProperties.class), any(NetworkCapabilities.class), any(), any(),

                any(), anyInt());

                anyInt());



        // The network should have IPv6 address now

        assertThat(mDataNetworkUT.getLinkProperties().getAllAddresses()).containsExactly(