Merge "Add logging to track down bug" into jb-mr2-dev (ad7a1d56) · Commits · e / os / android_frameworks_base

core/java/android/net/DhcpStateMachine.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ public class DhcpStateMachine extends StateMachine {
		RENEW
		};

		private String mInterfaceName;
		private final String mInterfaceName;
		private boolean mRegisteredForPreDhcpNotification = false;

		private static final int BASE = Protocol.BASE_DHCP;
		@@ -349,6 +349,7 @@ public class DhcpStateMachine extends StateMachine {
		private boolean runDhcp(DhcpAction dhcpAction) {
		boolean success = false;
		DhcpResults dhcpResults = new DhcpResults();
		dhcpResults.linkProperties.mLogMe = true;

		if (dhcpAction == DhcpAction.START) {
		/* Stop any existing DHCP daemon before starting new */

core/java/android/net/LinkProperties.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.net.ProxyProperties;
		import android.os.Parcelable;
		import android.os.Parcel;
		import android.text.TextUtils;
		import android.util.Log;

		import java.net.InetAddress;
		import java.net.UnknownHostException;
		@@ -57,6 +58,7 @@ public class LinkProperties implements Parcelable {
		private String mDomains;
		private Collection<RouteInfo> mRoutes = new ArrayList<RouteInfo>();
		private ProxyProperties mHttpProxy;
		public boolean mLogMe;

		public static class CompareResult<T> {
		public Collection<T> removed = new ArrayList<T>();
		@@ -75,6 +77,7 @@ public class LinkProperties implements Parcelable {

		public LinkProperties() {
		clear();
		mLogMe = false;
		}

		// copy constructor instead of clone
		@@ -91,6 +94,14 @@ public class LinkProperties implements Parcelable {
		}

		public void setInterfaceName(String iface) {
		if (mLogMe) {
		Log.d("LinkProperties", "setInterfaceName from " + mIfaceName +
		" to " + iface);
		for (StackTraceElement e : Thread.currentThread().getStackTrace()) {
		Log.d("LinkProperties", " " + e.toString());
		}
		}

		mIfaceName = iface;
		ArrayList<RouteInfo> newRoutes = new ArrayList<RouteInfo>(mRoutes.size());
		for (RouteInfo route : mRoutes) {
		@@ -166,6 +177,13 @@ public class LinkProperties implements Parcelable {
		}

		public void clear() {
		if (mLogMe) {
		Log.d("LinkProperties", "clear from " + mIfaceName);
		for (StackTraceElement e : Thread.currentThread().getStackTrace()) {
		Log.d("LinkProperties", " " + e.toString());
		}
		}

		mIfaceName = null;
		mLinkAddresses.clear();
		mDnses.clear();