diff options
author | Xiao Ma <xiaom@google.com> | 2020-04-06 11:24:48 +0000 |
---|---|---|
committer | Xiao Ma <xiaom@google.com> | 2020-04-07 01:27:59 +0000 |
commit | f8783184b025b0ac2353b0f384cee1b3340f2f18 (patch) | |
tree | c287e023392d5ef7615dff3a33b4a9eebfdc2f2d /src/android/net/dhcp/DhcpServer.java | |
parent | 520e8de52699c1264732c4b6c23aa89a7da669d5 (diff) |
Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic.
This change renames IDhcpLeaseCallbacks, easier to expand in the
future and adds a new method onNewPrefixRequest which will be called
on DHCP server receives DHCPDECLINE message and request a new IPv4
prefix from IpServer.
Bug: 130741856
Test: atest NetworkStackTests NetworkStackNextTests
Merged-In: Ia7b08bb1e7feda08ffe9fbb8885dbc8b7bdd66c9
Change-Id: Ia7b08bb1e7feda08ffe9fbb8885dbc8b7bdd66c9
Diffstat (limited to 'src/android/net/dhcp/DhcpServer.java')
-rw-r--r-- | src/android/net/dhcp/DhcpServer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/android/net/dhcp/DhcpServer.java b/src/android/net/dhcp/DhcpServer.java index 9c5b3c6..064aa5d 100644 --- a/src/android/net/dhcp/DhcpServer.java +++ b/src/android/net/dhcp/DhcpServer.java @@ -285,11 +285,11 @@ public class DhcpServer extends IDhcpServer.Stub { */ @Override public void startWithCallbacks(@Nullable INetworkStackStatusCallback statusCb, - @Nullable IDhcpLeaseCallbacks leaseCb) { + @Nullable IDhcpEventCallbacks eventCb) { mDeps.checkCaller(); mHandlerThread.start(); mHandler = new ServerHandler(mHandlerThread.getLooper()); - sendMessage(CMD_START_DHCP_SERVER, new Pair<>(statusCb, leaseCb)); + sendMessage(CMD_START_DHCP_SERVER, new Pair<>(statusCb, eventCb)); } /** @@ -356,8 +356,8 @@ public class DhcpServer extends IDhcpServer.Stub { cb = pair.second; break; case CMD_START_DHCP_SERVER: - final Pair<INetworkStackStatusCallback, IDhcpLeaseCallbacks> obj = - (Pair<INetworkStackStatusCallback, IDhcpLeaseCallbacks>) msg.obj; + final Pair<INetworkStackStatusCallback, IDhcpEventCallbacks> obj = + (Pair<INetworkStackStatusCallback, IDhcpEventCallbacks>) msg.obj; cb = obj.first; if (obj.second != null) { mLeaseRepo.addLeaseCallbacks(obj.second); |