diff options
| author | Oscar Shu <xshu@google.com> | 2020-05-08 20:45:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-08 20:45:43 +0000 |
| commit | 1e1c61eb82305ea9da754e63ee5b42ab92f77776 (patch) | |
| tree | 9f343e5ee28a42be3d94fd8e807bb165da2d8c66 /service | |
| parent | 8d09a0a84e9e67d723e5cd5858ca66e68e7f10ae (diff) | |
| parent | 1f49228c3fae4028e08363241a8c171afb759329 (diff) | |
Merge "Metrics for num devices with wifi wake enabled" into rvc-dev am: 1f49228c3f
Change-Id: I9bc8a443bc7045bffce6d2a69c2c57af2e3a87e5
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMetrics.java | 10 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 1 | ||||
| -rw-r--r-- | service/proto/src/metrics.proto | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java index 72ab4f3d8..da07edfc1 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -1695,6 +1695,15 @@ public class WifiMetrics { } /** + * Wifi wake feature toggle. + */ + public void setWifiWakeEnabled(boolean enabled) { + synchronized (mLock) { + mWifiLogProto.isWifiWakeEnabled = enabled; + } + } + + /** * Increment Non Empty Scan Results count */ public void incrementNonEmptyScanResultCount() { @@ -3062,6 +3071,7 @@ public class WifiMetrics { + mWifiLogProto.isVerboseLoggingEnabled); pw.println("mWifiLogProto.isEnhancedMacRandomizationForceEnabled=" + mWifiLogProto.isEnhancedMacRandomizationForceEnabled); + pw.println("mWifiLogProto.isWifiWakeEnabled=" + mWifiLogProto.isWifiWakeEnabled); pw.println("mWifiLogProto.numNetworksAddedByUser=" + mWifiLogProto.numNetworksAddedByUser); pw.println("mWifiLogProto.numNetworksAddedByApps=" diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 73fb306f9..c04e98cbd 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -3202,6 +3202,7 @@ public class WifiServiceImpl extends BaseWifiService { mWifiMetrics.setEnhancedMacRandomizationForceEnabled(isEnhancedMacRandEnabled); mWifiMetrics.setIsScanningAlwaysEnabled(isScanAlwaysAvailable()); mWifiMetrics.setVerboseLoggingEnabled(mVerboseLoggingEnabled); + mWifiMetrics.setWifiWakeEnabled(mWifiInjector.getWakeupController().isEnabled()); } @Override diff --git a/service/proto/src/metrics.proto b/service/proto/src/metrics.proto index 55b3c2af8..531d64b17 100644 --- a/service/proto/src/metrics.proto +++ b/service/proto/src/metrics.proto @@ -700,6 +700,9 @@ message WifiLog { // Metered stats for suggestion networks. optional MeteredNetworkStats metered_network_stats_suggestion = 196; + + // Does the user have wifi wake enabled. + optional bool is_wifi_wake_enabled = 197; } // Information that gets logged for every WiFi connection. |