Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am: 6d14940a0e am: 93052429e0

Browse Source 
am: 37c8698c1f

Change-Id: Ifae53ba606a45b988706f9153e1163294e375607
This commit is contained in:
Erik Kline
2017-11-05 09:17:43 +00:00
committed by android-build-merger
parent 7370d8bd07 37c8698c1f
commit aa422681a6
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/net/java/android/net/ip/IpClient.java
View File

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

10
services/net/java/android/net/ip/IpManager.java
View File

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