resolved conflicts for merge of b954337d to master
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6fa468a..5a8d35f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1257,11 +1257,11 @@
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;