commit 7d018e9b56ac5fb323bdc2b34abda3d188f39459
author Remi NGUYEN VAN <reminv@google.com> Thu Aug 08 06:43:40 2019 -0700
committer Remi NGUYEN VAN <reminv@google.com> Fri Aug 09 09:43:10 2019 +0000
tree e402bb78fd5dcd95536c93d8c8bf0f78b517f9c8
parent da046065c42a34a248b6245424d63c7512e258e6

Fix interfaceVersion in DhcpServerCallbacks

The getInterfaceVersion method was missed when freezing the AIDL
interface version.
This causes Q devices to return 0 instead of 3 on this interface.

Fixes: 139110717
Test: toggle tethering, dumpsys network_stack version
Merged-In: I782f479de2d7d4c6579f206645a580c905009d85
(cherry picked from commit c6c1c69378872d489b9635adf6ca9496a0479d00)

Change-Id: I16b08e77351399d937b037c700b6e454b09f6d16

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