summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-03-11 23:12:46 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-03-11 23:12:46 +0000
commit01d0c90282be9a8af986e8f2668a261015cfa4c4 (patch)
treed1e53026e8267c706b4e1b7c23d97ddd4b5c549d
parent805321a56a06fae653edc802e8150ff25285b791 (diff)
parent47622333f37484d6cf2ebae422e245e0d002d832 (diff)
downloadandroid_frameworks_opt_net_wifi-01d0c90282be9a8af986e8f2668a261015cfa4c4.tar.gz
android_frameworks_opt_net_wifi-01d0c90282be9a8af986e8f2668a261015cfa4c4.tar.bz2
android_frameworks_opt_net_wifi-01d0c90282be9a8af986e8f2668a261015cfa4c4.zip
Snap for 6285821 from 47622333f37484d6cf2ebae422e245e0d002d832 to qt-qpr3-release
Change-Id: I994bb9b6fae012e9cdf2bf0bdf228ae74dd79d2e
-rw-r--r--service/java/com/android/server/wifi/WifiConfigManager.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index a2f10914a..9472367fb 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1558,6 +1558,12 @@ public class WifiConfigManager {
*/
private void setNetworkSelectionEnabled(WifiConfiguration config) {
NetworkSelectionStatus status = config.getNetworkSelectionStatus();
+ if (status.getNetworkSelectionStatus()
+ != NetworkSelectionStatus.NETWORK_SELECTION_ENABLED) {
+ localLog("setNetworkSelectionEnabled: configKey=" + config.configKey()
+ + " old networkStatus=" + status.getNetworkStatusString()
+ + " disableReason=" + status.getNetworkDisableReasonString());
+ }
status.setNetworkSelectionStatus(
NetworkSelectionStatus.NETWORK_SELECTION_ENABLED);
status.setDisableTime(