From 22526e0139bea1928d635c56c6d30ac22baa05d5 Mon Sep 17 00:00:00 2001
From: Erik Kline <ek@google.com>
Date: Tue, 31 Oct 2017 11:37:41 +0900
Subject: [PATCH] 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
---
 services/net/java/android/net/ip/IpClient.java  |  4 ++--
 services/net/java/android/net/ip/IpManager.java | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/services/net/java/android/net/ip/IpClient.java b/services/net/java/android/net/ip/IpClient.java
index 2359fab412602..24f1cf3409689 100644
--- a/services/net/java/android/net/ip/IpClient.java
+++ b/services/net/java/android/net/ip/IpClient.java
@@ -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;
             }
diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
index b12cb32cd5f1a..38981453e2e1a 100644
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -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;