diff options
author | Wink Saville <wink@google.com> | 2010-10-10 12:27:34 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-10 12:27:34 -0700 |
commit | 96619f9f0653a5c7f407c52ab565b5ddf23ad696 (patch) | |
tree | dcbade9a286168814c457d75cb6d376514c149e9 | |
parent | 7efff5c4c571d1a0111e31d73a87d27e1fae9de6 (diff) | |
parent | 572172befbdf020e96ee4b10506b2b7cd5f1a09b (diff) | |
download | frameworks_base-96619f9f0653a5c7f407c52ab565b5ddf23ad696.zip frameworks_base-96619f9f0653a5c7f407c52ab565b5ddf23ad696.tar.gz frameworks_base-96619f9f0653a5c7f407c52ab565b5ddf23ad696.tar.bz2 |
Merge "Add some error-case logging." into gingerbread
-rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 8114be9..a663c3a 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -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 + - " because Mobile Data Disabled"); - } + 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); + String reasonText; + if (reason == null) { + reasonText = "."; + } else { + reasonText = " (" + reason + ")."; } + 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); |