Merge "Fix Wifi state not updated while connecting" into rvc-dev am: a8e808221e am: 9137490889

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803411

Change-Id: I79957cef106bd9fc5a8e1769df80b81e6dfbad36
This commit is contained in:
TreeHugger Robot
2020-06-09 21:52:04 +00:00
committed by Automerger Merge Worker

View File

@@ -900,9 +900,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
updateNetworkInfo(info);
fetchScansAndConfigsAndUpdateAccessPoints();
} else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
NetworkInfo info =
mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork());
updateNetworkInfo(info);
updateNetworkInfo(/* networkInfo= */ null);
}
}
};
@@ -948,7 +946,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
// We don't send a NetworkInfo object along with this message, because even if we
// fetch one from ConnectivityManager, it might be older than the most recent
// NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.
updateNetworkInfo(null);
updateNetworkInfo(/* networkInfo= */ null);
}
}
}