LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gingerbread' into gingerbread-release

Browse Source
This commit is contained in:
The Android Automerger
2010-10-10 16:36:36 -07:00
parent f80e11a3b3 e981bc5138
commit e116997c2a
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/java/com/android/server/ConnectivityService.java
View File

@@ -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);