LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18

Browse Source 
Change-Id: I735c1c19a6255bdfd0fa09050dbb403fd9e43c7a
This commit is contained in:
Xiao Ma
2020-04-06 11:02:14 +00:00
committed by Automerger Merge Worker
parent 2aea86b521 a73e5c5c18
commit d0b65f11be
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Tethering/src/android/net/ip/IpServer.java
View File

@@ -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;