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

Commit 6f2fc99f 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." into rvc-dev am: b145e470 am: 3d6e44f9 am: 98c72a1b

Change-Id: Ic5d132f2d5347c6975203e6441774ddbe7f4334d
parents 138c4a92 98c72a1b

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;