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

2 files changed, 10 insertions, 10 deletions

diff --git a/src/android/net/dhcp/DhcpLeaseRepository.java b/src/android/net/dhcp/DhcpLeaseRepository.java
index 1dc2f7f..d0dc389 100644
--- a/src/android/net/dhcp/DhcpLeaseRepository.java
+++ b/src/android/net/dhcp/DhcpLeaseRepository.java
@@ -89,7 +89,7 @@ class DhcpLeaseRepository {
     private long mNextExpirationCheck = EXPIRATION_NEVER;
 
     @NonNull
-    private RemoteCallbackList<IDhcpLeaseCallbacks> mLeaseCallbacks = new RemoteCallbackList<>();
+    private RemoteCallbackList<IDhcpEventCallbacks> mEventCallbacks = new RemoteCallbackList<>();
 
     static class DhcpLeaseException extends Exception {
         DhcpLeaseException(String message) {
@@ -381,15 +381,15 @@ class DhcpLeaseRepository {
             leaseParcelables.add(committedLease.toParcelable());
         }
 
-        final int cbCount = mLeaseCallbacks.beginBroadcast();
+        final int cbCount = mEventCallbacks.beginBroadcast();
         for (int i = 0; i < cbCount; i++) {
             try {
-                mLeaseCallbacks.getBroadcastItem(i).onLeasesChanged(leaseParcelables);
+                mEventCallbacks.getBroadcastItem(i).onLeasesChanged(leaseParcelables);
             } catch (RemoteException e) {
                 mLog.e("Could not send lease callback", e);
             }
         }
-        mLeaseCallbacks.finishBroadcast();
+        mEventCallbacks.finishBroadcast();
     }
 
     public void markLeaseDeclined(@NonNull Inet4Address addr) {
@@ -425,9 +425,9 @@ class DhcpLeaseRepository {
     /**
      * Add callbacks that will be called on leases update.
      */
-    public void addLeaseCallbacks(@NonNull IDhcpLeaseCallbacks cb) {
+    public void addLeaseCallbacks(@NonNull IDhcpEventCallbacks cb) {
         Objects.requireNonNull(cb, "Callbacks must be non-null");
-        mLeaseCallbacks.register(cb);
+        mEventCallbacks.register(cb);
     }
 
     /**
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);