joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

am 4777fd12: am 3cc68d33: Fix the reporting of NO_CONNECTIVITY.

Browse source 
Merge commit '4777fd12d8'

* commit '4777fd12d8':
  Fix the reporting of NO_CONNECTIVITY.
This commit is contained in:
Robert Greenwalt 2010-01-28 14:46:55 -08:00 • committed by Android Git Automerger
commit fe630655d2
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
services/java/com/android/server/ConnectivityService.java
View file

@ -828,12 +828,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
info.getExtraInfo());
}
NetworkStateTracker newNet = tryFailover(prevNetType);
if (newNet != null) {
NetworkInfo switchTo = newNet.getNetworkInfo();
intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);
} else {
intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);
NetworkStateTracker newNet = null;
if (mNetAttributes[prevNetType].isDefault()) {
newNet = tryFailover(prevNetType);
if (newNet != null) {
NetworkInfo switchTo = newNet.getNetworkInfo();
intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);
} else {
intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);
}
}
// do this before we broadcast the change
handleConnectivityChange();
@ -848,7 +851,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
}
// returns -1 if no failover available
// returns null if no failover available
private NetworkStateTracker tryFailover(int prevNetType) {
/*
* If this is a default network, check if other defaults are available
@ -970,13 +973,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
info.setFailover(false);
}
NetworkStateTracker newNet = tryFailover(info.getType());
if (newNet != null) {
NetworkInfo switchTo = newNet.getNetworkInfo();
intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);
} else {
intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);
NetworkStateTracker newNet = null;
if (mNetAttributes[info.getType()].isDefault()) {
newNet = tryFailover(info.getType());
if (newNet != null) {
NetworkInfo switchTo = newNet.getNetworkInfo();
intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);
} else {
intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);
}
}
// do this before we broadcast the change
handleConnectivityChange();