commit | 67129ae7eaa385096c740ed16fcb7089dd598e44 | [log] [tgz] |
---|---|---|
author | Paul Trautrim <paultrautrim@google.com> | Tue Jan 28 23:34:16 2020 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 28 23:34:16 2020 +0000 |
tree | 5f5cac9e242500f06e6fa00dfca6f5a689b4e4b7 | |
parent | 0c7a4b7d8e7da6d423fd83d3657b252153a63e60 [diff] | |
parent | 60f090a8ff77ea75445bb7d1fdcd57b8edd737c3 [diff] |
Merge "Add implementation of getInterfaceHash()"
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; + } }
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 {
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; + } }