Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96866b6c authored by Paul Trautrim's avatar Paul Trautrim Committed by android-build-merger
Browse files

Merge "Add implementation of getInterfaceHash()" 

am: 06262516

Change-Id: I4d69160572a16e8095e31e641d516f322941da7d
parents 87a25e33 06262516

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

+5 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -734,6 +734,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
        public int getInterfaceVersion() {

            return INetdUnsolicitedEventListener.VERSION;

        }



        @Override

        public String getInterfaceHash() {

            return INetdUnsolicitedEventListener.HASH;

        }

    }



    //