diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-21 06:05:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-21 06:05:13 +0000 |
| commit | 25ada1ff4b9782d3175a1d5fd93e97a1559bcb84 (patch) | |
| tree | c207a33f9d6040b79554fa3ae226a350247fef6b /service | |
| parent | 3280ce7359f081628980661afc46890bd90a71c9 (diff) | |
| parent | 7f871799e7233c9cf16def8be78e1926bbc544d5 (diff) | |
Merge changes I7f95fec0,I81810626 into rvc-dev
* changes:
WifiDumpsysMetricsTest: ensure that only DUMP permission is needed
Fix Wifi Metrics not uploading
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index b03d24b3e..0772b4c80 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -3199,7 +3199,7 @@ public class WifiServiceImpl extends BaseWifiService { WifiConfigManager.ENHANCED_MAC_RANDOMIZATION_FEATURE_FORCE_ENABLE_FLAG, 0) == 1 ? true : false; mWifiMetrics.setEnhancedMacRandomizationForceEnabled(isEnhancedMacRandEnabled); - mWifiMetrics.setIsScanningAlwaysEnabled(isScanAlwaysAvailable()); + mWifiMetrics.setIsScanningAlwaysEnabled(mSettingsStore.isScanAlwaysAvailable()); mWifiMetrics.setVerboseLoggingEnabled(mVerboseLoggingEnabled); mWifiMetrics.setWifiWakeEnabled(mWifiInjector.getWakeupController().isEnabled()); } |