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

resolved conflicts for merge of b954337d to master

Browse Source
This commit is contained in:
Robert Greenwalt
2010-01-15 10:45:11 -08:00
parent d48f8ee465 b954337d20
commit 0aca4b8c8c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1257,11 +1257,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
info = (NetworkInfo) msg.obj; info = (NetworkInfo) msg.obj;
int type = info.getType(); int type = info.getType();
NetworkInfo.State state = info.getState(); NetworkInfo.State state = info.getState();
if(mNetAttributes[type].mLastState == state) { if (mNetAttributes[type].mLastState == state) {
if (DBG) { if (DBG) {
// TODO - remove this after we validate the dropping doesn't break anything // TODO - remove this after we validate the dropping doesn't break anything
Log.d(TAG, "Dropping ConnectivityChange for " + Log.d(TAG, "Dropping ConnectivityChange for " +
info.getTypeName() +": " + info.getTypeName() + ": " +
state + "/" + info.getDetailedState()); state + "/" + info.getDetailedState());
} }
return; return;