Merge "Fix interfaceVersion in DhcpServerCallbacks" into qt-r1-dev

2019-08-15 03:27:35 +00:00
parent 24397e7a07 7d018e9b56
commit 9a0d576b4d
1 changed files with 2 additions and 4 deletions
--- a/services/net/java/android/net/dhcp/DhcpServerCallbacks.java
+++ b/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;
    }
 }