resolved conflicts for merge of b954337d to master am: 0aca4b8c8c

Original change: undetermined Change-Id: I189f014a4e7085cbac94690f1fb71424a302218b
2021-05-31 10:30:34 +00:00
parent 33b279d348 0aca4b8c8c
commit 69175a4e13
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;