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

Commit 4af7c5e2 authored by Xiao Ma's avatar Xiao Ma Committed by Gerrit Code Review
Browse files

Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic."

parents a941cd53 31853376

packages/Tethering/src/android/net/ip/IpServer.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ import android.net.dhcp.DhcpLeaseParcelable; 
import android.net.dhcp.DhcpServerCallbacks;

import android.net.dhcp.DhcpServerCallbacks;

import android.net.dhcp.DhcpServingParamsParcel;

import android.net.dhcp.DhcpServingParamsParcel;

import android.net.dhcp.DhcpServingParamsParcelExt;

import android.net.dhcp.DhcpServingParamsParcelExt;

import android.net.dhcp.IDhcpLeaseCallbacks;

import android.net.dhcp.IDhcpEventCallbacks;

import android.net.dhcp.IDhcpServer;

import android.net.dhcp.IDhcpServer;

import android.net.ip.IpNeighborMonitor.NeighborEvent;

import android.net.ip.IpNeighborMonitor.NeighborEvent;

import android.net.ip.RouterAdvertisementDaemon.RaParams;

import android.net.ip.RouterAdvertisementDaemon.RaParams;
@@ -463,7 +463,7 @@ public class IpServer extends StateMachine { 
        }

        }

    }

    }





    private class DhcpLeaseCallback extends IDhcpLeaseCallbacks.Stub {

    private class DhcpLeaseCallback extends IDhcpEventCallbacks.Stub {

        @Override

        @Override

        public void onLeasesChanged(List<DhcpLeaseParcelable> leaseParcelables) {

        public void onLeasesChanged(List<DhcpLeaseParcelable> leaseParcelables) {

            final ArrayList<TetheredClient> leases = new ArrayList<>();

            final ArrayList<TetheredClient> leases = new ArrayList<>();
@@ -496,6 +496,11 @@ public class IpServer extends StateMachine { 
            });

            });

        }

        }





        @Override

        public void onNewPrefixRequest(IpPrefix currentPrefix) {

            //TODO: add specific implementation.

        }



        @Override

        @Override

        public int getInterfaceVersion() {

        public int getInterfaceVersion() {

            return this.VERSION;

            return this.VERSION;