Merge "Add implementation of getInterfaceHash()"

am: 062625165e

Change-Id: I4d69160572a16e8095e31e641d516f322941da7d

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

@@ -28,4 +28,9 @@ public abstract class DhcpServerCallbacks extends IDhcpServerCallbacks.Stub {
     public int getInterfaceVersion() {
         return IDhcpServerCallbacks.VERSION;
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IDhcpServerCallbacks.HASH;
+    }
 }

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

@@ -301,6 +301,11 @@ public class IpServer extends StateMachine {
         public int getInterfaceVersion() {
             return this.VERSION;
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return this.HASH;
+        }
     }
 
     private class DhcpServerCallbacksImpl extends DhcpServerCallbacks {

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

@@ -67,4 +67,9 @@ public class BaseNetdUnsolicitedEventListener extends INetdUnsolicitedEventListe
     public int getInterfaceVersion() {
         return INetdUnsolicitedEventListener.VERSION;
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return INetdUnsolicitedEventListener.HASH;
+    }
 }

services/core/java/com/android/server/ConnectivityService.java

@@ -2955,6 +2955,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
         public int getInterfaceVersion() {
             return this.VERSION;
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return this.HASH;
+        }
     }
 
     private boolean networkRequiresPrivateDnsValidation(NetworkAgentInfo nai) {

services/core/java/com/android/server/NetworkManagementService.java

@@ -734,6 +734,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
         public int getInterfaceVersion() {
             return INetdUnsolicitedEventListener.VERSION;
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return INetdUnsolicitedEventListener.HASH;
+        }
     }
 
     //

services/core/java/com/android/server/connectivity/NetdEventListenerService.java

@@ -310,6 +310,11 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
         return this.VERSION;
     }
 
+    @Override
+    public String getInterfaceHash() {
+        return this.HASH;
+    }
+
     private void addWakeupEvent(WakeupEvent event) {
         String iface = event.iface;
         mWakeupEvents.append(event);

services/net/java/android/net/IpMemoryStore.java

@@ -52,6 +52,11 @@ public class IpMemoryStore extends IpMemoryStoreClient {
                     public int getInterfaceVersion() {
                         return this.VERSION;
                     }
+
+                    @Override
+                    public String getInterfaceHash() {
+                        return this.HASH;
+                    }
                 });
     }
 

services/net/java/android/net/ip/IpClientUtil.java

@@ -189,6 +189,11 @@ public class IpClientUtil {
         public int getInterfaceVersion() {
             return this.VERSION;
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return this.HASH;
+        }
     }
 
     /**