Merge "Add some error-case logging." into gingerbread (96619f9f) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+13 −16

Original line number	Diff line number	Diff line
		@@ -1038,10 +1038,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		if (mNetAttributes[checkType] == null) continue;
		if (mNetAttributes[checkType].mRadio == ConnectivityManager.TYPE_MOBILE &&
		noMobileData) {
		if (DBG) {
		Slog.d(TAG, "not failing over to mobile type " + checkType +
		Slog.e(TAG, "not failing over to mobile type " + checkType +
		" because Mobile Data Disabled");
		}
		continue;
		}
		if (mNetAttributes[checkType].isDefault()) {
		@@ -1089,6 +1087,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		newNet = null; // not officially avail.. try anyway, but
		// report no failover
		}
		} else {
		Slog.e(TAG, "Network failover failing.");
		}
		}

		@@ -1131,16 +1131,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		String reason = info.getReason();
		String extraInfo = info.getExtraInfo();

		if (DBG) {
		String reasonText;
		if (reason == null) {
		reasonText = ".";
		} else {
		reasonText = " (" + reason + ").";
		}
		Slog.v(TAG, "Attempt to connect to " + info.getTypeName() +
		" failed" + reasonText);
		}
		Slog.e(TAG, "Attempt to connect to " + info.getTypeName() + " failed" + reasonText);

		Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
		intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);
		@@ -1164,9 +1161,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		if (newNet != null) {
		NetworkInfo switchTo = newNet.getNetworkInfo();
		if (!switchTo.isConnected()) {
		// if the other net is connected they've already reset this and perhaps even gotten
		// a positive report we don't want to overwrite, but if not we need to clear this now
		// to turn our cellular sig strength white
		// if the other net is connected they've already reset this and perhaps
		// even gotten a positive report we don't want to overwrite, but if not
		// we need to clear this now to turn our cellular sig strength white
		mDefaultInetConditionPublished = 0;
		}
		intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);