Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f4ae11e authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic."... 

Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: ee5606d4 am: 1b3260c1

Change-Id: Iaad926c8620d6a1b6e94b67be6ed07d5bc705612
parents 9b92bfbe 1b3260c1

common/networkstackclient/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,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",

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpLeaseCallbacks.aidl→common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpEventCallbacks.aidl

+2 −1
Original line number Diff line number Diff line
@@ -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);

}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/IDhcpServer.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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;

common/networkstackclient/src/android/net/dhcp/IDhcpLeaseCallbacks.aidl→common/networkstackclient/src/android/net/dhcp/IDhcpEventCallbacks.aidl

+14 −2
Original line number Diff line number Diff line
@@ -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);



    /**

     * 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);

}

common/networkstackclient/src/android/net/dhcp/IDhcpServer.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;