resolved conflicts for merge of b954337d to master

2010-01-15 10:45:11 -08:00
parent d48f8ee465 b954337d20
commit 0aca4b8c8c
1 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1257,11 +1257,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                    info = (NetworkInfo) msg.obj;
                    int type = info.getType();
                    NetworkInfo.State state = info.getState();
-                    if(mNetAttributes[type].mLastState == state) {
+                    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() +": " +
+                                    info.getTypeName() + ": " +
                                    state + "/" + info.getDetailedState());
                        }
                        return;