Merge changes I6a51d803,I162fae5c am: b524e17519 am: 18013cefe3 (84aa44d2) · Commits · e / os / android_frameworks_base

core/java/android/os/INetworkManagementService.aidl

+0 −8

Original line number	Diff line number	Diff line
		@@ -116,11 +116,6 @@ interface INetworkManagementService
		*/
		void removeRoute(int netId, in RouteInfo route);

		/**
		* Set the specified MTU size
		*/
		void setMtu(String iface, int mtu);

		/**
		* Shuts down the service
		*/
		@@ -352,9 +347,6 @@ interface INetworkManagementService

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

		void setDefaultNetId(int netId);
		void clearDefaultNetId();

		/**
		* Set permission for a network.
		* @param permission PERMISSION_NONE to clear permissions.

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -2431,9 +2431,9 @@ public class ConnectivityService extends IConnectivityManager.Stub

		try {
		if (VDBG \|\| DDBG) log("Setting MTU size: " + iface + ", " + mtu);
		mNMS.setMtu(iface, mtu);
		} catch (Exception e) {
		Slog.e(TAG, "exception in setMtu()" + e);
		mNetd.interfaceSetMtu(iface, mtu);
		} catch (RemoteException \| ServiceSpecificException e) {
		Slog.e(TAG, "exception in interfaceSetMtu()" + e);
		}
		}

		@@ -6700,11 +6700,11 @@ public class ConnectivityService extends IConnectivityManager.Stub

		try {
		if (null != newNetwork) {
		mNMS.setDefaultNetId(newNetwork.network.netId);
		mNetd.networkSetDefault(newNetwork.network.netId);
		} else {
		mNMS.clearDefaultNetId();
		mNetd.networkClearDefault();
		}
		} catch (Exception e) {
		} catch (RemoteException \| ServiceSpecificException e) {
		loge("Exception setting default network :" + e);
		}

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

+0 −33

Original line number	Diff line number	Diff line
		@@ -944,17 +944,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
		return list;
		}

		@Override
		public void setMtu(String iface, int mtu) {
		NetworkStack.checkNetworkStackPermission(mContext);

		try {
		mNetdService.interfaceSetMtu(iface, mtu);
		} catch (RemoteException \| ServiceSpecificException e) {
		throw new IllegalStateException(e);
		}
		}

		@Override
		public void shutdown() {
		// TODO: remove from aidl if nobody calls externally
		@@ -2019,28 +2008,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
		}
		}

		@Override
		public void setDefaultNetId(int netId) {
		NetworkStack.checkNetworkStackPermission(mContext);

		try {
		mNetdService.networkSetDefault(netId);
		} catch (RemoteException \| ServiceSpecificException e) {
		throw new IllegalStateException(e);
		}
		}

		@Override
		public void clearDefaultNetId() {
		NetworkStack.checkNetworkStackPermission(mContext);

		try {
		mNetdService.networkClearDefault();
		} catch (RemoteException \| ServiceSpecificException e) {
		throw new IllegalStateException(e);
		}
		}

		@Override
		public void setNetworkPermission(int netId, int permission) {
		NetworkStack.checkNetworkStackPermission(mContext);

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -6023,23 +6023,23 @@ public class ConnectivityServiceTest {
		mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
		mCellNetworkAgent.connect(true);
		trustedCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
		verify(mNetworkManagementService).setDefaultNetId(eq(mCellNetworkAgent.getNetwork().netId));
		reset(mNetworkManagementService);
		verify(mMockNetd).networkSetDefault(eq(mCellNetworkAgent.getNetwork().netId));
		reset(mMockNetd);

		mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
		mWiFiNetworkAgent.connect(true);
		trustedCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent);
		verify(mNetworkManagementService).setDefaultNetId(eq(mWiFiNetworkAgent.getNetwork().netId));
		reset(mNetworkManagementService);
		verify(mMockNetd).networkSetDefault(eq(mWiFiNetworkAgent.getNetwork().netId));
		reset(mMockNetd);

		mWiFiNetworkAgent.removeCapability(NET_CAPABILITY_TRUSTED);
		trustedCallback.expectAvailableCallbacksValidated(mCellNetworkAgent);
		verify(mNetworkManagementService).setDefaultNetId(eq(mCellNetworkAgent.getNetwork().netId));
		reset(mNetworkManagementService);
		verify(mMockNetd).networkSetDefault(eq(mCellNetworkAgent.getNetwork().netId));
		reset(mMockNetd);

		mCellNetworkAgent.removeCapability(NET_CAPABILITY_TRUSTED);
		trustedCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);
		verify(mNetworkManagementService).clearDefaultNetId();
		verify(mMockNetd).networkClearDefault();

		mCm.unregisterNetworkCallback(trustedCallback);
		}