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

Merge "Also copy-construct multinetwork policy preference"

Browse Source 
am: 0c7343ccd7

Change-Id: I86de7978ca2571902946d4aff3fe278156c7466b
This commit is contained in:
Erik Kline
2018-08-29 01:24:46 -07:00
committed by android-build-merger
parent 83a7650baf 0c7343ccd7
commit ccf3aebc41
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,6 +431,7 @@ public class IpClient extends StateMachine {
public ProvisioningConfiguration(ProvisioningConfiguration other) { public ProvisioningConfiguration(ProvisioningConfiguration other) {
mEnableIPv4 = other.mEnableIPv4; mEnableIPv4 = other.mEnableIPv4;
mEnableIPv6 = other.mEnableIPv6; mEnableIPv6 = other.mEnableIPv6;
mUsingMultinetworkPolicyTracker = other.mUsingMultinetworkPolicyTracker;
mUsingIpReachabilityMonitor = other.mUsingIpReachabilityMonitor; mUsingIpReachabilityMonitor = other.mUsingIpReachabilityMonitor;
mRequestedPreDhcpActionMs = other.mRequestedPreDhcpActionMs; mRequestedPreDhcpActionMs = other.mRequestedPreDhcpActionMs;
mInitialConfig = InitialConfiguration.copy(other.mInitialConfig); mInitialConfig = InitialConfiguration.copy(other.mInitialConfig);