Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev (b145e470) · Commits · e / os / android_frameworks_base

packages/Tethering/src/android/net/ip/IpServer.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import android.net.dhcp.DhcpLeaseParcelable;
		import android.net.dhcp.DhcpServerCallbacks;
		import android.net.dhcp.DhcpServingParamsParcel;
		import android.net.dhcp.DhcpServingParamsParcelExt;
		import android.net.dhcp.IDhcpLeaseCallbacks;
		import android.net.dhcp.IDhcpEventCallbacks;
		import android.net.dhcp.IDhcpServer;
		import android.net.ip.IpNeighborMonitor.NeighborEvent;
		import android.net.ip.RouterAdvertisementDaemon.RaParams;
		@@ -462,7 +462,7 @@ public class IpServer extends StateMachine {
		}
		}

		private class DhcpLeaseCallback extends IDhcpLeaseCallbacks.Stub {
		private class DhcpLeaseCallback extends IDhcpEventCallbacks.Stub {
		@Override
		public void onLeasesChanged(List<DhcpLeaseParcelable> leaseParcelables) {
		final ArrayList<TetheredClient> leases = new ArrayList<>();
		@@ -495,6 +495,11 @@ public class IpServer extends StateMachine {
		});
		}

		@Override
		public void onNewPrefixRequest(IpPrefix currentPrefix) {
		//TODO: add specific implementation.
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;