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

resolved conflicts for merge of 902a8dd6 to master

Browse Source
This commit is contained in:
Robert Greenwalt
2010-01-26 10:09:52 -08:00
parent 58a72c1740 902a8dd611
commit 793a52486f
1 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -828,6 +828,28 @@ public class ConnectivityService extends IConnectivityManager.Stub {
info.getExtraInfo()); 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);
}
// do this before we broadcast the change
handleConnectivityChange();
sendStickyBroadcast(intent);
/*
* If the failover network is already connected, then immediately send
* out a followup broadcast indicating successful failover
*/
if (newNet != null && newNet.getNetworkInfo().isConnected()) {
sendConnectedBroadcast(newNet.getNetworkInfo());
}
}
// returns -1 if no failover available
private NetworkStateTracker tryFailover(int prevNetType) {
/* /*
* If this is a default network, check if other defaults are available * If this is a default network, check if other defaults are available
* or active * or active
@@ -840,8 +862,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int newType = -1; int newType = -1;
int newPriority = -1; int newPriority = -1;
for (int checkType=0; checkType <= for (int checkType=0; checkType <= ConnectivityManager.MAX_NETWORK_TYPE; checkType++) {
ConnectivityManager.MAX_NETWORK_TYPE; checkType++) {
if (checkType == prevNetType) continue; if (checkType == prevNetType) continue;
if (mNetAttributes[checkType] == null) continue; if (mNetAttributes[checkType] == null) continue;
if (mNetAttributes[checkType].isDefault()) { if (mNetAttributes[checkType].isDefault()) {
@@ -884,29 +905,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
switchTo.getTypeName()); switchTo.getTypeName());
} }
} }
intent.putExtra(ConnectivityManager.
EXTRA_OTHER_NETWORK_INFO, switchTo);
} else { } else {
intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY,
true);
newNet.reconnect(); newNet.reconnect();
} }
} else {
intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY,
true);
} }
} }
// do this before we broadcast the change return newNet;
handleConnectivityChange();
sendStickyBroadcast(intent);
/*
* If the failover network is already connected, then immediately send
* out a followup broadcast indicating successful failover
*/
if (newNet != null && newNet.getNetworkInfo().isConnected())
sendConnectedBroadcast(newNet.getNetworkInfo());
} }
private void sendConnectedBroadcast(NetworkInfo info) { private void sendConnectedBroadcast(NetworkInfo info) {
@@ -964,7 +969,25 @@ public class ConnectivityService extends IConnectivityManager.Stub {
intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true); intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true);
info.setFailover(false); 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);
}
// do this before we broadcast the change
handleConnectivityChange();
sendStickyBroadcast(intent); sendStickyBroadcast(intent);
/*
* If the failover network is already connected, then immediately send
* out a followup broadcast indicating successful failover
*/
if (newNet != null && newNet.getNetworkInfo().isConnected()) {
sendConnectedBroadcast(newNet.getNetworkInfo());
}
} }
private void sendStickyBroadcast(Intent intent) { private void sendStickyBroadcast(Intent intent) {