WifiMetrics: Add metrics for failed SAR sensor reg

This commit adds the metric for counting failures in registration of
SAR sensor listener.

Bug: 65174506
Test: Unit tests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      This test validates that the metric is updated when the
      registration of SAR sensor listener fails.
Test: Booted device, ran the command:
      adb shell dumpsys wifi
      Verified the line in output:
      mWifiLogProto.numSarSensorRegistrationFailures=0
Test: Forced a registration failure by removing the sensor cal data
      from device (/persist/sensors), then ran the command:
      adb shell dumpsys wifi
      Verified the line in output:
      mWifiLogProto.numSarSensorRegistrationFailures=1

Change-Id: I565be94d0cefdd097d6dc2ecb71dd6b73d419760
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>

2 files changed, 15 insertions, 2 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java b/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java
index 369dcba33..d5c8d786b 100644
--- a/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java
@@ -91,6 +91,7 @@ public class SarManagerTest {
     @Mock TelephonyManager mTelephonyManager;
     @Mock private ApplicationInfo mMockApplInfo;
     @Mock WifiNative mWifiNative;
+    @Mock WifiMetrics mWifiMetrics;
 
     @Before
     public void setUp() throws Exception {
@@ -190,7 +191,7 @@ public class SarManagerTest {
         }
 
         mSarMgr = new SarManager(mContext, mTelephonyManager, mLooper.getLooper(),
-                mWifiNative, mSensorManager);
+                mWifiNative, mSensorManager, mWifiMetrics);
 
         if (isSarEnabled) {
             /* Capture the PhoneStateListener */
@@ -212,6 +213,8 @@ public class SarManagerTest {
             assertNotNull(mSensorEventListener);
         }
 
+        verify(mWifiMetrics, never()).incrementNumSarSensorRegistrationFailures();
+
         /* Enable logs from SarManager */
         enableDebugLogs();
     }
@@ -242,7 +245,7 @@ public class SarManagerTest {
         prepareSensorInfo(sensorRegisterReturn);
 
         mSarMgr = new SarManager(mContext, mTelephonyManager, mLooper.getLooper(),
-                mWifiNative, mSensorManager);
+                mWifiNative, mSensorManager, mWifiMetrics);
 
         /* Capture the PhoneStateListener */
         ArgumentCaptor<PhoneStateListener> phoneStateListenerCaptor =
@@ -697,6 +700,7 @@ public class SarManagerTest {
 
         verify(mSensorManager, never()).registerListener(any(SensorEventListener.class),
                 any(Sensor.class), anyInt());
+        verify(mWifiMetrics).incrementNumSarSensorRegistrationFailures();
 
         /* Enable WiFi Client */
         mSarMgr.setClientWifiState(WifiManager.WIFI_STATE_ENABLED);
@@ -731,6 +735,7 @@ public class SarManagerTest {
 
         verify(mSensorManager, never()).registerListener(any(SensorEventListener.class),
                 any(Sensor.class), anyInt());
+        verify(mWifiMetrics).incrementNumSarSensorRegistrationFailures();
 
         /* Enable WiFi Client */
         mSarMgr.setClientWifiState(WifiManager.WIFI_STATE_ENABLED);
@@ -763,6 +768,7 @@ public class SarManagerTest {
 
         verify(mSensorManager).registerListener(any(SensorEventListener.class),
                 any(Sensor.class), anyInt());
+        verify(mWifiMetrics).incrementNumSarSensorRegistrationFailures();
 
         InOrder inOrder = inOrder(mWifiNative);
 
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index 4fbee803d..26f8d33f9 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -310,6 +310,7 @@ public class WifiMetricsTest {
     private static final boolean LINK_SPEED_COUNTS_LOGGING_SETTING = true;
     private static final int DATA_STALL_MIN_TX_BAD_SETTING = 5;
     private static final int DATA_STALL_MIN_TX_SUCCESS_WITHOUT_RX_SETTING = 75;
+    private static final int NUM_SAR_SENSOR_LISTENER_REGISTRATION_FAILURES = 5;
 
     /** Number of notifications per "Connect to Network" notification type. */
     private static final int[] NUM_CONNECT_TO_NETWORK_NOTIFICATIONS = {0, 10, 20, 30, 40};
@@ -702,6 +703,9 @@ public class WifiMetricsTest {
         for (int i = 0; i < NUM_WPS_CANCELLATION; i++) {
             mWifiMetrics.incrementWpsCancellationCount();
         }
+        for (int i = 0; i < NUM_SAR_SENSOR_LISTENER_REGISTRATION_FAILURES; i++) {
+            mWifiMetrics.incrementNumSarSensorRegistrationFailures();
+        }
 
         mWifiMetrics.setWatchdogSuccessTimeDurationMs(NUM_WATCHDOG_SUCCESS_DURATION_MS);
         mWifiMetrics.setIsMacRandomizationOn(IS_MAC_RANDOMIZATION_ON);
@@ -1008,6 +1012,9 @@ public class WifiMetricsTest {
                 mDecodedProto.experimentValues.wifiDataStallMinTxBad);
         assertEquals(DATA_STALL_MIN_TX_SUCCESS_WITHOUT_RX_SETTING,
                 mDecodedProto.experimentValues.wifiDataStallMinTxSuccessWithoutRx);
+
+        assertEquals(NUM_SAR_SENSOR_LISTENER_REGISTRATION_FAILURES,
+                mDecodedProto.numSarSensorRegistrationFailures);
     }
 
     /**