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

resolved conflicts for merge of 2a9c1a3e to master

Browse Source
This commit is contained in:
Robert Greenwalt
2009-12-08 13:30:56 -08:00
parent 6e78d3fdc3 2a9c1a3e42
commit d1b12bd772
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private boolean mSystemReady; private boolean mSystemReady;
private ArrayList<Intent> mDeferredBroadcasts; private ArrayList<Intent> mDeferredBroadcasts;
private class NetworkAttributes { private static class NetworkAttributes {
/** /**
* Class for holding settings read from resources. * Class for holding settings read from resources.
*/ */
@@ -108,12 +108,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
public int mType; public int mType;
public int mRadio; public int mRadio;
public int mPriority; public int mPriority;
public NetworkInfo.State mLastState;
public NetworkAttributes(String init) { public NetworkAttributes(String init) {
String fragments[] = init.split(","); String fragments[] = init.split(",");
mName = fragments[0].toLowerCase(); mName = fragments[0].toLowerCase();
mType = Integer.parseInt(fragments[1]); mType = Integer.parseInt(fragments[1]);
mRadio = Integer.parseInt(fragments[2]); mRadio = Integer.parseInt(fragments[2]);
mPriority = Integer.parseInt(fragments[3]); mPriority = Integer.parseInt(fragments[3]);
mLastState = NetworkInfo.State.UNKNOWN;
} }
public boolean isDefault() { public boolean isDefault() {
return (mType == mRadio); return (mType == mRadio);
@@ -122,7 +124,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
NetworkAttributes[] mNetAttributes; NetworkAttributes[] mNetAttributes;
int mNetworksDefined; int mNetworksDefined;
private class RadioAttributes { private static class RadioAttributes {
public int mSimultaneity; public int mSimultaneity;
public int mType; public int mType;
public RadioAttributes(String init) { public RadioAttributes(String init) {
@@ -1218,9 +1220,22 @@ public class ConnectivityService extends IConnectivityManager.Stub {
switch (msg.what) { switch (msg.what) {
case NetworkStateTracker.EVENT_STATE_CHANGED: case NetworkStateTracker.EVENT_STATE_CHANGED:
info = (NetworkInfo) msg.obj; info = (NetworkInfo) msg.obj;
int type = info.getType();
NetworkInfo.State state = info.getState();
if(mNetAttributes[type].mLastState == state) {
if (DBG) {
// TODO - remove this after we validate the dropping doesn't break anything
Log.d(TAG, "Dropping ConnectivityChange for " +
info.getTypeName() +": " +
state + "/" + info.getDetailedState());
}
return;
}
mNetAttributes[type].mLastState = state;
if (DBG) Log.d(TAG, "ConnectivityChange for " + if (DBG) Log.d(TAG, "ConnectivityChange for " +
info.getTypeName() + ": " + info.getTypeName() + ": " +
info.getState() + "/" + info.getDetailedState()); state + "/" + info.getDetailedState());
// Connectivity state changed: // Connectivity state changed:
// [31-13] Reserved for future use // [31-13] Reserved for future use
@@ -1238,10 +1253,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (info.getDetailedState() == if (info.getDetailedState() ==
NetworkInfo.DetailedState.FAILED) { NetworkInfo.DetailedState.FAILED) {
handleConnectionFailure(info); handleConnectionFailure(info);
} else if (info.getState() == } else if (state == NetworkInfo.State.DISCONNECTED) {
NetworkInfo.State.DISCONNECTED) {
handleDisconnect(info); handleDisconnect(info);
} else if (info.getState() == NetworkInfo.State.SUSPENDED) { } else if (state == NetworkInfo.State.SUSPENDED) {
// TODO: need to think this over. // TODO: need to think this over.
// the logic here is, handle SUSPENDED the same as // the logic here is, handle SUSPENDED the same as
// DISCONNECTED. The only difference being we are // DISCONNECTED. The only difference being we are
@@ -1250,7 +1264,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// opportunity to handle DISCONNECTED and SUSPENDED // opportunity to handle DISCONNECTED and SUSPENDED
// differently, or not. // differently, or not.
handleDisconnect(info); handleDisconnect(info);
} else if (info.getState() == NetworkInfo.State.CONNECTED) { } else if (state == NetworkInfo.State.CONNECTED) {
handleConnect(info); handleConnect(info);
} }
break; break;