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

Commit d35c4ea5 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Also copy-construct multinetwork policy preference" am: 0c7343cc 

am: ccf3aebc

Change-Id: Id79a3b6e982add78815c287148957246c00fc28c
parents ec139ee4 ccf3aebc

services/net/java/android/net/ip/IpClient.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -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);