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

Commit aa422681 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"... 

Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am: 6d14940a am: 93052429
am: 37c8698c

Change-Id: Ifae53ba606a45b988706f9153e1163294e375607
parents 7370d8bd 37c8698c

services/net/java/android/net/ip/IpClient.java

+2 −2
Original line number Diff line number Diff line
@@ -310,12 +310,12 @@ public class IpClient extends StateMachine { 
                return this;

            }



            public Builder withIPv6AddrGenModeEUI64() {

            public Builder withRandomMacAddress() {

                mConfig.mIPv6AddrGenMode = INetd.IPV6_ADDR_GEN_MODE_EUI64;

                return this;

            }



            public Builder withIPv6AddrGenModeStablePrivacy() {

            public Builder withStableMacAddress() {

                mConfig.mIPv6AddrGenMode = INetd.IPV6_ADDR_GEN_MODE_STABLE_PRIVACY;

                return this;

            }

services/net/java/android/net/ip/IpManager.java

+0 −10
Original line number Diff line number Diff line
@@ -88,16 +88,6 @@ public class IpManager extends IpClient { 
                return this;

            }

            @Override

            public Builder withIPv6AddrGenModeEUI64() {

                super.withIPv6AddrGenModeEUI64();

                return this;

            }

            @Override

            public Builder withIPv6AddrGenModeStablePrivacy() {

                super.withIPv6AddrGenModeStablePrivacy();

                return this;

            }

            @Override

            public Builder withNetwork(Network network) {

                super.withNetwork(network);

                return this;