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

Commit c6c1c693 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Fix interfaceVersion in DhcpServerCallbacks" am: e921001f am:... 

Merge "Fix interfaceVersion in DhcpServerCallbacks" am: e921001f am: 5833474d am: 9832b480 am: 2d7c2ddf
am: 1041a58c

Change-Id: I782f479de2d7d4c6579f206645a580c905009d85
parents a98e4142 1041a58c

services/net/java/android/net/dhcp/DhcpServerCallbacks.java

+2 −4
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ package android.net.dhcp; 
 * @hide

 */

public abstract class DhcpServerCallbacks extends IDhcpServerCallbacks.Stub {

    // TODO: add @Override here once the API is versioned



    /**

     * Get the version of the aidl interface implemented by the callbacks.

     */

    @Override

    public int getInterfaceVersion() {

        // TODO: return IDhcpServerCallbacks.VERSION;

        return 0;

        return IDhcpServerCallbacks.VERSION;

    }

}