Merge "Metrics for num devices with wifi wake enabled" into rvc-dev am: 1f49228c3f

Change-Id: I9bc8a443bc7045bffce6d2a69c2c57af2e3a87e5

4 files changed, 17 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.
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index 5b73f7a08..fc9dfba0a 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -318,6 +318,7 @@ public class WifiMetricsTest extends WifiBaseTest {
     private static final boolean IS_SCANNING_ALWAYS_ENABLED = true;
     private static final boolean IS_VERBOSE_LOGGING_ENABLED = true;
     private static final boolean IS_ENHANCED_MAC_RANDOMIZATION_FORCE_ENABLED = true;
+    private static final boolean IS_WIFI_WAKE_ENABLED = true;
     private static final int NUM_EMPTY_SCAN_RESULTS = 19;
     private static final int NUM_NON_EMPTY_SCAN_RESULTS = 23;
     private static final int NUM_SCAN_UNKNOWN = 1;
@@ -677,6 +678,7 @@ public class WifiMetricsTest extends WifiBaseTest {
         mWifiMetrics.setVerboseLoggingEnabled(IS_VERBOSE_LOGGING_ENABLED);
         mWifiMetrics.setEnhancedMacRandomizationForceEnabled(
                 IS_ENHANCED_MAC_RANDOMIZATION_FORCE_ENABLED);
+        mWifiMetrics.setWifiWakeEnabled(IS_WIFI_WAKE_ENABLED);
 
         for (int i = 0; i < NUM_EMPTY_SCAN_RESULTS; i++) {
             mWifiMetrics.incrementEmptyScanResultCount();
@@ -1127,6 +1129,7 @@ public class WifiMetricsTest extends WifiBaseTest {
         assertEquals(IS_VERBOSE_LOGGING_ENABLED, mDecodedProto.isVerboseLoggingEnabled);
         assertEquals(IS_ENHANCED_MAC_RANDOMIZATION_FORCE_ENABLED,
                 mDecodedProto.isEnhancedMacRandomizationForceEnabled);
+        assertEquals(IS_WIFI_WAKE_ENABLED, mDecodedProto.isWifiWakeEnabled);
         assertEquals("mDecodedProto.numEmptyScanResults == NUM_EMPTY_SCAN_RESULTS",
                 NUM_EMPTY_SCAN_RESULTS, mDecodedProto.numEmptyScanResults);
         assertEquals("mDecodedProto.numNonEmptyScanResults == NUM_NON_EMPTY_SCAN_RESULTS",