commit e921001f2d2cbb38053773a35ffba86a6d14c384
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 08 12:41:51 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 08 12:41:51 2019 +0000
tree b0ff5e5dafbbfabd53350d7f6c82919a52539976
parent f83748ae28a5327d4b3426452d2ae31034e2d1a0
parent 5488c56b9868eeb4814dd424e29fba3e27814f5a

Merge "Fix interfaceVersion in DhcpServerCallbacks"

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

diff --git a/services/net/java/android/net/dhcp/DhcpServerCallbacks.java b/services/net/java/android/net/dhcp/DhcpServerCallbacks.java
index bb56876..7c413779 100644
--- a/services/net/java/android/net/dhcp/DhcpServerCallbacks.java
+++ b/services/net/java/android/net/dhcp/DhcpServerCallbacks.java
@@ -21,13 +21,11 @@
  * @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;
     }
 }