Merge "Fix interfaceVersion in DhcpServerCallbacks" am: e921001f2d am: 5833474d58

am: 9832b48095

Change-Id: I2988d1db2879ab62d82f5ddb603d8845831cd71c

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

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