Merge "Remove WPS metrics" into rvc-dev

1 files changed, 0 insertions, 45 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index 0b9885c93..d374dc9ce 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -108,7 +108,6 @@ import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiIsUnusableEvent;
 import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiRadioUsage;
 import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiUsabilityStats;
 import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiUsabilityStatsEntry;
-import com.android.server.wifi.proto.nano.WifiMetricsProto.WpsMetrics;
 import com.android.server.wifi.rtt.RttMetrics;
 import com.android.server.wifi.util.ExternalCallbackTracker;
 import com.android.server.wifi.util.InformationElementUtil;
@@ -421,14 +420,6 @@ public class WifiMetricsTest extends WifiBaseTest {
     private static final int NUM_PNO_SCAN_ATTEMPTS = 20;
     private static final int NUM_PNO_SCAN_FAILED = 5;
     private static final int NUM_PNO_FOUND_NETWORK_EVENTS = 10;
-    private static final int NUM_WPS_ATTEMPTS = 17;
-    private static final int NUM_WPS_SUCCESS = 21;
-    private static final int NUM_WPS_START_FAILURE = 7;
-    private static final int NUM_WPS_OVERLAP_FAILURE = 3;
-    private static final int NUM_WPS_TIMEOUT_FAILURE = 8;
-    private static final int NUM_WPS_OTHER_CONNECTION_FAILURE = 16;
-    private static final int NUM_WPS_SUPPLICANT_FAILURE = 12;
-    private static final int NUM_WPS_CANCELLATION = 11;
     private static final int NUM_RADIO_MODE_CHANGE_TO_MCC = 4;
     private static final int NUM_RADIO_MODE_CHANGE_TO_SCC = 13;
     private static final int NUM_RADIO_MODE_CHANGE_TO_SBS = 19;
@@ -947,31 +938,6 @@ public class WifiMetricsTest extends WifiBaseTest {
 
         addSoftApEventsToMetrics();
 
-        // increment wps metrics
-        for (int i = 0; i < NUM_WPS_ATTEMPTS; i++) {
-            mWifiMetrics.incrementWpsAttemptCount();
-        }
-        for (int i = 0; i < NUM_WPS_SUCCESS; i++) {
-            mWifiMetrics.incrementWpsSuccessCount();
-        }
-        for (int i = 0; i < NUM_WPS_START_FAILURE; i++) {
-            mWifiMetrics.incrementWpsStartFailureCount();
-        }
-        for (int i = 0; i < NUM_WPS_OVERLAP_FAILURE; i++) {
-            mWifiMetrics.incrementWpsOverlapFailureCount();
-        }
-        for (int i = 0; i < NUM_WPS_TIMEOUT_FAILURE; i++) {
-            mWifiMetrics.incrementWpsTimeoutFailureCount();
-        }
-        for (int i = 0; i < NUM_WPS_OTHER_CONNECTION_FAILURE; i++) {
-            mWifiMetrics.incrementWpsOtherConnectionFailureCount();
-        }
-        for (int i = 0; i < NUM_WPS_SUPPLICANT_FAILURE; i++) {
-            mWifiMetrics.incrementWpsSupplicantFailureCount();
-        }
-        for (int i = 0; i < NUM_WPS_CANCELLATION; i++) {
-            mWifiMetrics.incrementWpsCancellationCount();
-        }
         for (int i = 0; i < NUM_ONESHOT_SCAN_REQUESTS_WITH_DFS_CHANNELS; i++) {
             mWifiMetrics.incrementOneshotScanWithDfsCount();
         }
@@ -1397,17 +1363,6 @@ public class WifiMetricsTest extends WifiBaseTest {
 
         verifySoftApEventsStoredInProto();
 
-        WpsMetrics wps_metrics = mDecodedProto.wpsMetrics;
-        assertNotNull(wps_metrics);
-        assertEquals(NUM_WPS_ATTEMPTS, wps_metrics.numWpsAttempts);
-        assertEquals(NUM_WPS_SUCCESS, wps_metrics.numWpsSuccess);
-        assertEquals(NUM_WPS_START_FAILURE, wps_metrics.numWpsStartFailure);
-        assertEquals(NUM_WPS_OVERLAP_FAILURE, wps_metrics.numWpsOverlapFailure);
-        assertEquals(NUM_WPS_TIMEOUT_FAILURE, wps_metrics.numWpsTimeoutFailure);
-        assertEquals(NUM_WPS_OTHER_CONNECTION_FAILURE, wps_metrics.numWpsOtherConnectionFailure);
-        assertEquals(NUM_WPS_SUPPLICANT_FAILURE, wps_metrics.numWpsSupplicantFailure);
-        assertEquals(NUM_WPS_CANCELLATION, wps_metrics.numWpsCancellation);
-
         assertEquals(NUM_WATCHDOG_SUCCESS_DURATION_MS,
                 mDecodedProto.watchdogTriggerToConnectionSuccessDurationMs);
         assertEquals(IS_MAC_RANDOMIZATION_ON, mDecodedProto.isMacRandomizationOn);