diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-05 03:12:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-05 03:12:29 +0000 |
commit | 83e8a7ab59dc750f630bdd96a8e4773e4ca984ba (patch) | |
tree | 156e534e706d48543177d6f246a54d516a113b82 /service/java/com/android/server/wifi/WifiConnectivityManager.java | |
parent | db68688e4eeeeceb9ab1b3bc422f77458fba2f24 (diff) | |
parent | 470817b13e56d915805729ab4f51075f3fa2ec15 (diff) | |
download | android_frameworks_opt_net_wifi-83e8a7ab59dc750f630bdd96a8e4773e4ca984ba.tar.gz android_frameworks_opt_net_wifi-83e8a7ab59dc750f630bdd96a8e4773e4ca984ba.tar.bz2 android_frameworks_opt_net_wifi-83e8a7ab59dc750f630bdd96a8e4773e4ca984ba.zip |
Merge "Blame scan request from WifiManager.reconnect()" into oc-mr1-dev
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConnectivityManager.java')
-rw-r--r-- | service/java/com/android/server/wifi/WifiConnectivityManager.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index 6bfce74db..458f73ae6 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -31,6 +31,7 @@ import android.net.wifi.WifiScanner.ScanSettings; import android.os.Handler; import android.os.Looper; import android.os.Process; +import android.os.WorkSource; import android.util.LocalLog; import android.util.Log; @@ -215,7 +216,7 @@ public class WifiConnectivityManager { @Override public void onAlarm() { - startSingleScan(mIsFullBandScan); + startSingleScan(mIsFullBandScan, WIFI_WORK_SOURCE); } } @@ -795,7 +796,7 @@ public class WifiConnectivityManager { localLog("start a single scan from watchdogHandler"); scheduleWatchdogTimer(); - startSingleScan(true); + startSingleScan(true, WIFI_WORK_SOURCE); } } @@ -824,7 +825,7 @@ public class WifiConnectivityManager { } mLastPeriodicSingleScanTimeStamp = currentTimeStamp; - startSingleScan(isFullBandScan); + startSingleScan(isFullBandScan, WIFI_WORK_SOURCE); schedulePeriodicScanTimer(mPeriodicSingleScanInterval); // Set up the next scan interval in an exponential backoff fashion. @@ -851,7 +852,7 @@ public class WifiConnectivityManager { } // Start a single scan - private void startSingleScan(boolean isFullBandScan) { + private void startSingleScan(boolean isFullBandScan, WorkSource workSource) { if (!mWifiEnabled || !mWifiConnectivityManagerEnabled) { return; } @@ -876,7 +877,7 @@ public class WifiConnectivityManager { SingleScanListener singleScanListener = new SingleScanListener(isFullBandScan); - mScanner.startScan(settings, singleScanListener, WIFI_WORK_SOURCE); + mScanner.startScan(settings, singleScanListener, workSource); } // Start a periodic scan when screen is on @@ -1133,11 +1134,11 @@ public class WifiConnectivityManager { /** * Handler for on-demand connectivity scan */ - public void forceConnectivityScan() { - localLog("forceConnectivityScan"); + public void forceConnectivityScan(WorkSource workSource) { + localLog("forceConnectivityScan in request of " + workSource); mWaitForFullBandScanResults = true; - startSingleScan(true); + startSingleScan(true, workSource); } /** |