Merge "Remove unused methods from NMS" into main (84b7fb75) · Commits · e / os / android_frameworks_base

core/java/android/os/INetworkManagementService.aidl

+0 −10

Original line number	Diff line number	Diff line
		@@ -103,16 +103,6 @@ interface INetworkManagementService
		@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
		void setIPv6AddrGenMode(String iface, int mode);

		/**
		* Add the specified route to the interface.
		*/
		void addRoute(int netId, in RouteInfo route);

		/**
		* Remove the specified route from the interface.
		*/
		void removeRoute(int netId, in RouteInfo route);

		/**
		* Shuts down the service
		*/

+0 −13

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ import com.android.internal.util.DumpUtils;
		import com.android.internal.util.HexDump;
		import com.android.modules.utils.build.SdkLevel;
		import com.android.net.module.util.NetdUtils;
		import com.android.net.module.util.NetdUtils.ModifyOperation;
		import com.android.net.module.util.PermissionUtils;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		@@ -758,18 +757,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
		}
		}

		@Override
		public void addRoute(int netId, RouteInfo route) {
		PermissionUtils.enforceNetworkStackPermission(mContext);
		NetdUtils.modifyRoute(mNetdService, ModifyOperation.ADD, netId, route);
		}

		@Override
		public void removeRoute(int netId, RouteInfo route) {
		PermissionUtils.enforceNetworkStackPermission(mContext);
		NetdUtils.modifyRoute(mNetdService, ModifyOperation.REMOVE, netId, route);
		}

		@android.annotation.EnforcePermission(android.Manifest.permission.SHUTDOWN)
		@Override
		public void shutdown() {