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

Commit 22526e01 authored Oct 31, 2017 by Erik Kline

Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()

Callers of IpClient can tell it via the Builder whether a stable or
a random link-layer identifier is used.  IpClient will make the
appropriate IP-layer adjustments (for now this means RFC 7217
addresses or not).

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh runs as well
      as possible on AOSP (no new errors)
Bug: 62476366
Change-Id: Ic9d52ea4f2c6c3588852ed41c81f8664d5cc298a

parent 80c3c709

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;