Merge changes I1250730c,I7d00848c am: e693d49c0a (9a13aa9f) · Commits · e / os / android_frameworks_base

core/java/android/net/INetworkManagementEventObserver.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.net.RouteInfo;
		*
		* @hide
		*/
		interface INetworkManagementEventObserver {
		oneway interface INetworkManagementEventObserver {
		/**
		* Interface configuration status has changed.
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,10 +18,12 @@ package android.net;
		import android.net.INetworkMonitorCallbacks;
		import android.net.dhcp.DhcpServingParamsParcel;
		import android.net.dhcp.IDhcpServerCallbacks;
		import android.net.ip.IIpClientCallbacks;

		/** @hide */
		oneway interface INetworkStackConnector {
		void makeDhcpServer(in String ifName, in DhcpServingParamsParcel params,
		in IDhcpServerCallbacks cb);
		void makeNetworkMonitor(int netId, String name, in INetworkMonitorCallbacks cb);
		void makeIpClient(in String ifName, in IIpClientCallbacks callbacks);
		}
		No newline at end of file

+16 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.content.Intent;
		import android.content.ServiceConnection;
		import android.net.dhcp.DhcpServingParamsParcel;
		import android.net.dhcp.IDhcpServerCallbacks;
		import android.net.ip.IIpClientCallbacks;
		import android.os.Binder;
		import android.os.IBinder;
		import android.os.Process;
		@@ -83,6 +84,21 @@ public class NetworkStack {
		});
		}

		/**
		* Create an IpClient on the specified interface.
		*
		* <p>The IpClient will be returned asynchronously through the provided callbacks.
		*/
		public void makeIpClient(String ifName, IIpClientCallbacks cb) {
		requestConnector(connector -> {
		try {
		connector.makeIpClient(ifName, cb);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		});
		}

		/**
		* Create a NetworkMonitor.
		*

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ java_library {
		":services-networkstack-shared-srcs",
		],
		static_libs: [
		"dhcp-packet-lib",
		"services-netlink-lib",
		]
		}