commit bbfcd5421b36f4d788e0a60ee3c7fca8403c6f7f
author Paul Trautrim <paultrautrim@google.com> Thu Jan 23 14:55:57 2020 +0900
committer Paul Trautrim <paultrautrim@google.com> Wed Jan 29 14:09:56 2020 +0900
tree 4edfe278932502f639adfb39c8fd346e9f5ff9d1
parent 68578dd2cebbb369b20cb44b0d59d1748f728d2a

Add implementation of getInterfaceHash()

Exempt-From-Owner-Approval: cherry-pick from internal
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
Merged-In: I314f19aeca82cc8653eab71c9526ea7a208e6b50

Tethering/src/android/net/dhcp/DhcpServerCallbacks.java

diff --git a/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java b/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java
index 7c41377..9fda125 100644
--- a/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java
+++ b/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java
@@ -28,4 +28,9 @@
     public int getInterfaceVersion() {
         return IDhcpServerCallbacks.VERSION;
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IDhcpServerCallbacks.HASH;
+    }
 }

Tethering/src/android/net/ip/IpServer.java

diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java
index 190d250..f39e7af 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -301,6 +301,11 @@
         public int getInterfaceVersion() {
             return this.VERSION;
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return this.HASH;
+        }
     }
 
     private class DhcpServerCallbacksImpl extends DhcpServerCallbacks {

Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java

diff --git a/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java b/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java
index 3218c0b..b1ffdb0 100644
--- a/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java
+++ b/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java
@@ -67,4 +67,9 @@
     public int getInterfaceVersion() {
         return INetdUnsolicitedEventListener.VERSION;
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return INetdUnsolicitedEventListener.HASH;
+    }
 }