Merge "Replace hidden NMS interface to network API" am: 2a40529747 (667b0912) · Commits · e / os / android_frameworks_base

core/java/android/os/INetworkManagementService.aidl

+0 −10

Original line number	Diff line number	Diff line
		@@ -350,16 +350,6 @@ interface INetworkManagementService
		*/
		boolean isNetworkActive();

		/**
		* Add an interface to a network.
		*/
		void addInterfaceToNetwork(String iface, int netId);

		/**
		* Remove an Interface from a network.
		*/
		void removeInterfaceFromNetwork(String iface, int netId);

		void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);

		void setDefaultNetId(int netId);

services/core/java/com/android/server/ConnectivityService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -6078,7 +6078,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		for (final String iface : interfaceDiff.added) {
		try {
		if (DBG) log("Adding iface " + iface + " to network " + netId);
		mNMS.addInterfaceToNetwork(iface, netId);
		mNetd.networkAddInterface(netId, iface);
		wakeupModifyInterface(iface, caps, true);
		bs.noteNetworkInterfaceType(iface, legacyType);
		} catch (Exception e) {
		@@ -6090,7 +6090,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		try {
		if (DBG) log("Removing iface " + iface + " from network " + netId);
		wakeupModifyInterface(iface, caps, false);
		mNMS.removeInterfaceFromNetwork(iface, netId);
		mNetd.networkRemoveInterface(netId, iface);
		} catch (Exception e) {
		loge("Exception removing interface: " + e);
		}

services/core/java/com/android/server/NetworkManagementService.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -1985,16 +1985,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
		pw.println("]");
		}

		@Override
		public void addInterfaceToNetwork(String iface, int netId) {
		modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, netId, iface);
		}

		@Override
		public void removeInterfaceFromNetwork(String iface, int netId) {
		modifyInterfaceInNetwork(MODIFY_OPERATION_REMOVE, netId, iface);
		}

		private void modifyInterfaceInNetwork(boolean add, int netId, String iface) {
		NetworkStack.checkNetworkStackPermission(mContext);
		try {

tests/net/java/com/android/server/ConnectivityServiceTest.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -6143,6 +6143,7 @@ public class ConnectivityServiceTest {
		verify(mMockNetd, times(1)).networkCreatePhysical(eq(cellNetId), anyInt());
		assertRoutesAdded(cellNetId, ipv6Subnet, defaultRoute);
		verify(mMockDnsResolver, times(1)).createNetworkCache(eq(cellNetId));
		verify(mMockNetd, times(1)).networkAddInterface(cellNetId, MOBILE_IFNAME);
		verify(mBatteryStatsService).noteNetworkInterfaceType(cellLp.getInterfaceName(),
		TYPE_MOBILE);

		@@ -6199,7 +6200,7 @@ public class ConnectivityServiceTest {
		.getStackedLinks();
		assertEquals(makeClatLinkProperties(myIpv4), stackedLps.get(0));
		assertRoutesAdded(cellNetId, stackedDefault);

		verify(mMockNetd, times(1)).networkAddInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME);
		// Change trivial linkproperties and see if stacked link is preserved.
		cellLp.addDnsServer(InetAddress.getByName("8.8.8.8"));
		mCellNetworkAgent.sendLinkProperties(cellLp);
		@@ -6230,6 +6231,7 @@ public class ConnectivityServiceTest {
		(lp) -> lp.getStackedLinks().size() == 0);
		verify(mMockNetd, times(1)).clatdStop(MOBILE_IFNAME);
		assertRoutesRemoved(cellNetId, stackedDefault);
		verify(mMockNetd, times(1)).networkRemoveInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME);

		verify(mMockNetd, times(1)).clatdStart(MOBILE_IFNAME, kOtherNat64Prefix.toString());
		networkCallback.expectLinkPropertiesThat(mCellNetworkAgent,
		@@ -6238,6 +6240,7 @@ public class ConnectivityServiceTest {
		networkCallback.expectLinkPropertiesThat(mCellNetworkAgent,
		(lp) -> lp.getStackedLinks().size() == 1);
		assertRoutesAdded(cellNetId, stackedDefault);
		verify(mMockNetd, times(1)).networkAddInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME);
		reset(mMockNetd);

		// Add ipv4 address, expect that clatd and prefix discovery are stopped and stacked
		@@ -6262,7 +6265,7 @@ public class ConnectivityServiceTest {
		// The interface removed callback happens but has no effect after stop is called.
		clat.interfaceRemoved(CLAT_PREFIX + MOBILE_IFNAME);
		networkCallback.assertNoCallback();

		verify(mMockNetd, times(1)).networkRemoveInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME);
		verifyNoMoreInteractions(mMockNetd);
		verifyNoMoreInteractions(mMockDnsResolver);
		reset(mNetworkManagementService);
		@@ -6295,6 +6298,7 @@ public class ConnectivityServiceTest {
		networkCallback.expectLinkPropertiesThat(mCellNetworkAgent,
		(lp) -> lp.getStackedLinks().size() == 1 && lp.getNat64Prefix() != null);
		assertRoutesAdded(cellNetId, stackedDefault);
		verify(mMockNetd, times(1)).networkAddInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME);

		// NAT64 prefix is removed. Expect that clat is stopped.
		mService.mNetdEventCallback.onNat64PrefixEvent(cellNetId, false /* added */,
		@@ -6307,8 +6311,8 @@ public class ConnectivityServiceTest {
		verify(mMockNetd, times(1)).clatdStop(MOBILE_IFNAME);
		networkCallback.expectLinkPropertiesThat(mCellNetworkAgent,
		(lp) -> lp.getStackedLinks().size() == 0);
		verify(mMockNetd, times(1)).networkRemoveInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME);
		verifyNoMoreInteractions(mMockNetd);

		// Clean up.
		mCellNetworkAgent.disconnect();
		networkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);