diff options
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 8 | ||||
| -rw-r--r-- | tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index 2823391..f266386 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -177,12 +177,16 @@ public class EthernetNetworkFactory extends NetworkFactory { return; } + final NetworkCapabilities nc = new NetworkCapabilities.Builder(capabilities) + .setNetworkSpecifier(new EthernetNetworkSpecifier(ifaceName)) + .build(); + if (DBG) { - Log.d(TAG, "addInterface, iface: " + ifaceName + ", capabilities: " + capabilities); + Log.d(TAG, "addInterface, iface: " + ifaceName + ", capabilities: " + nc); } final NetworkInterfaceState iface = new NetworkInterfaceState( - ifaceName, hwAddress, mHandler, mContext, ipConfig, capabilities, this, mDeps); + ifaceName, hwAddress, mHandler, mContext, ipConfig, nc, this, mDeps); mTrackingInterfaces.put(ifaceName, iface); updateCapabilityFilter(); } diff --git a/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java b/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java index e10497e..6cb13ef 100644 --- a/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java +++ b/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java @@ -71,6 +71,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -265,8 +266,12 @@ public class EthernetNetworkFactoryTest { triggerOnProvisioningSuccess(); // provisioning succeeded, verify that the network agent is created, registered, marked // as connected and legacy type are correctly set. - verify(mDeps).makeEthernetNetworkAgent(any(), any(), any(), any(), + final ArgumentCaptor<NetworkCapabilities> ncCaptor = ArgumentCaptor.forClass( + NetworkCapabilities.class); + verify(mDeps).makeEthernetNetworkAgent(any(), any(), ncCaptor.capture(), any(), argThat(x -> x.getLegacyType() == expectedLegacyType), any(), any()); + assertEquals( + new EthernetNetworkSpecifier(iface), ncCaptor.getValue().getNetworkSpecifier()); verifyNetworkAgentRegistersAndConnects(); clearInvocations(mDeps); clearInvocations(mNetworkAgent); |