Merge \\"Make provisioning timeout apply to both IPv4 and IPv6\\" into nyc-mr1-dev am: ce7ff88bc2 (10683847) · Commits · e / os / android_frameworks_base

services/net/java/android/net/ip/IpManager.java

+13 −12

Original line number	Diff line number	Diff line
		@@ -918,12 +918,6 @@ public class IpManager extends StateMachine {
		mDhcpClient = DhcpClient.makeDhcpClient(mContext, IpManager.this, mInterfaceName);
		mDhcpClient.registerForPreDhcpNotification();
		mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP);

		if (mConfiguration.mProvisioningTimeoutMs > 0) {
		final long alarmTime = SystemClock.elapsedRealtime() +
		mConfiguration.mProvisioningTimeoutMs;
		mProvisioningTimeoutAlarm.schedule(alarmTime);
		}
		}

		return true;
		@@ -1043,11 +1037,24 @@ public class IpManager extends StateMachine {
		mCallback.setFallbackMulticastFilter(mMulticastFiltering);
		}

		if (mConfiguration.mProvisioningTimeoutMs > 0) {
		final long alarmTime = SystemClock.elapsedRealtime() +
		mConfiguration.mProvisioningTimeoutMs;
		mProvisioningTimeoutAlarm.schedule(alarmTime);
		}

		if (mConfiguration.mEnableIPv6) {
		// TODO: Consider transitionTo(mStoppingState) if this fails.
		startIPv6();
		}

		if (mConfiguration.mEnableIPv4) {
		if (!startIPv4()) {
		transitionTo(mStoppingState);
		return;
		}
		}

		if (mConfiguration.mUsingIpReachabilityMonitor) {
		mIpReachabilityMonitor = new IpReachabilityMonitor(
		mContext,
		@@ -1059,12 +1066,6 @@ public class IpManager extends StateMachine {
		}
		});
		}

		if (mConfiguration.mEnableIPv4) {
		if (!startIPv4()) {
		transitionTo(mStoppingState);
		}
		}
		}

		@Override