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

am: 6d14940a0e

Change-Id: Id3a55dac1b99cfef7f7372eeac18973936f0c6e6

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;
             }

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;