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

5 files changed, 20 insertions, 7 deletions

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 9081af4..49e9688 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -71,7 +71,7 @@ aidl_interface {
         "src/android/net/TcpKeepalivePacketDataParcelable.aidl",
         "src/android/net/dhcp/DhcpLeaseParcelable.aidl",
         "src/android/net/dhcp/DhcpServingParamsParcel.aidl",
-        "src/android/net/dhcp/IDhcpLeaseCallbacks.aidl",
+        "src/android/net/dhcp/IDhcpEventCallbacks.aidl",
         "src/android/net/dhcp/IDhcpServer.aidl",
         "src/android/net/dhcp/IDhcpServerCallbacks.aidl",
         "src/android/net/ip/IIpClient.aidl",
diff --git a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpLeaseCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpEventCallbacks.aidl
index 673afe4..dfcaf98 100644
--- a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpLeaseCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpEventCallbacks.aidl
@@ -16,6 +16,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.
 
 package android.net.dhcp;
-interface IDhcpLeaseCallbacks {
+interface IDhcpEventCallbacks {
   oneway void onLeasesChanged(in List<android.net.dhcp.DhcpLeaseParcelable> newLeases);
+  oneway void onNewPrefixRequest(in android.net.IpPrefix currentPrefix);
 }
diff --git a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpServer.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpServer.aidl
index 3372062..ef936cc 100644
--- a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpServer.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpServer.aidl
@@ -19,7 +19,7 @@ package android.net.dhcp;
 /* @hide */
 interface IDhcpServer {
   oneway void start(in android.net.INetworkStackStatusCallback cb) = 0;
-  oneway void startWithCallbacks(in android.net.INetworkStackStatusCallback statusCb, in android.net.dhcp.IDhcpLeaseCallbacks leaseCb) = 3;
+  oneway void startWithCallbacks(in android.net.INetworkStackStatusCallback statusCb, in android.net.dhcp.IDhcpEventCallbacks eventCb) = 3;
   oneway void updateParams(in android.net.dhcp.DhcpServingParamsParcel params, in android.net.INetworkStackStatusCallback cb) = 1;
   oneway void stop(in android.net.INetworkStackStatusCallback cb) = 2;
   const int STATUS_UNKNOWN = 0;
diff --git a/common/networkstackclient/src/android/net/dhcp/IDhcpLeaseCallbacks.aidl b/common/networkstackclient/src/android/net/dhcp/IDhcpEventCallbacks.aidl
index cf2dfa8..155c528 100644
--- a/common/networkstackclient/src/android/net/dhcp/IDhcpLeaseCallbacks.aidl
+++ b/common/networkstackclient/src/android/net/dhcp/IDhcpEventCallbacks.aidl
@@ -16,9 +16,10 @@
 
 package android.net.dhcp;
 
+import android.net.IpPrefix;
 import android.net.dhcp.DhcpLeaseParcelable;
 
-oneway interface IDhcpLeaseCallbacks {
+oneway interface IDhcpEventCallbacks {
     /**
      * Called when a lease is committed or released on the DHCP server.
      *
@@ -27,4 +28,15 @@ oneway interface IDhcpLeaseCallbacks {
      * @param newLeases The new list of leases tracked by the server.
      */
     void onLeasesChanged(in List<DhcpLeaseParcelable> newLeases);
-}
\ No newline at end of file
+
+    /**
+     * Called when DHCP server receives DHCPDECLINE message and only if a new IPv4 address prefix
+     * (e.g. a different subnet prefix) is requested.
+     *
+     * <p>When this callback is called, IpServer must call IDhcpServer#updateParams with a new
+     * prefix, as processing of DHCP packets should be paused until the new prefix and route
+     * configuration on IpServer is completed.
+     * @param currentPrefix The current prefix parameter serving on DHCP server.
+     */
+    void onNewPrefixRequest(in IpPrefix currentPrefix);
+}
diff --git a/common/networkstackclient/src/android/net/dhcp/IDhcpServer.aidl b/common/networkstackclient/src/android/net/dhcp/IDhcpServer.aidl
index dd93174..973ffb0 100644
--- a/common/networkstackclient/src/android/net/dhcp/IDhcpServer.aidl
+++ b/common/networkstackclient/src/android/net/dhcp/IDhcpServer.aidl
@@ -18,7 +18,7 @@ package android.net.dhcp;
 
 import android.net.INetworkStackStatusCallback;
 import android.net.dhcp.DhcpServingParamsParcel;
-import android.net.dhcp.IDhcpLeaseCallbacks;
+import android.net.dhcp.IDhcpEventCallbacks;
 
 /** @hide */
 oneway interface IDhcpServer {
@@ -29,7 +29,7 @@ oneway interface IDhcpServer {
 
     void start(in INetworkStackStatusCallback cb) = 0;
     void startWithCallbacks(in INetworkStackStatusCallback statusCb,
-        in IDhcpLeaseCallbacks leaseCb) = 3;
+        in IDhcpEventCallbacks eventCb) = 3;
     void updateParams(in DhcpServingParamsParcel params, in INetworkStackStatusCallback cb) = 1;
     void stop(in INetworkStackStatusCallback cb) = 2;