From 59ab1b53b3a20b629ab23adff50d6ca8a8d635de Mon Sep 17 00:00:00 2001 From: Hakjun Choi Date: Mon, 31 Mar 2025 16:51:13 +0000 Subject: Fix wrong report for satelite eSOS event count remove the case satellite sms event was counted into sos metrics field Bug: 407545648 Flag: EXEMPT bug fix Test: atest ControllerMetricsStatsTest SatelliteControllerTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b142982da8c05da0f7cb0083ddfefdb4e5e3c48d) Merged-In: Id81b18dee5e6b0ca1162ef82afb1a413cb56cfdc Change-Id: Id81b18dee5e6b0ca1162ef82afb1a413cb56cfdc --- .../telephony/satellite/metrics/ControllerMetricsStats.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java b/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java index e84bd919ce..571c1054fa 100644 --- a/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java +++ b/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java @@ -147,8 +147,7 @@ public class ControllerMetricsStats { } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_KEEP_ALIVE) { builder.setCountOfDatagramTypeKeepAliveSuccess(ADD_COUNT).build(); } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_SMS) { - builder.setCountOfDatagramTypeSosSmsSuccess(ADD_COUNT) - .setCountOfOutgoingDatagramTypeSmsSuccess(ADD_COUNT); + builder.setCountOfOutgoingDatagramTypeSmsSuccess(ADD_COUNT); } } @@ -174,8 +173,7 @@ public class ControllerMetricsStats { } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_KEEP_ALIVE) { builder.setCountOfDatagramTypeKeepAliveFail(ADD_COUNT); } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_SMS) { - builder.setCountOfDatagramTypeSosSmsFail(ADD_COUNT) - .setCountOfOutgoingDatagramTypeSmsFail(ADD_COUNT); + builder.setCountOfOutgoingDatagramTypeSmsFail(ADD_COUNT); } } @@ -216,11 +214,9 @@ public class ControllerMetricsStats { SatelliteStats.SatelliteControllerParams.Builder builder = new SatelliteStats.SatelliteControllerParams.Builder(); if (result == SatelliteManager.SATELLITE_RESULT_SUCCESS) { - builder.setCountOfIncomingDatagramTypeSosSmsSuccess(ADD_COUNT) - .setCountOfIncomingDatagramTypeSmsSuccess(ADD_COUNT); + builder.setCountOfIncomingDatagramTypeSmsSuccess(ADD_COUNT); } else { - builder.setCountOfIncomingDatagramTypeSosSmsFail(ADD_COUNT) - .setCountOfIncomingDatagramTypeSmsFail(ADD_COUNT); + builder.setCountOfIncomingDatagramTypeSmsFail(ADD_COUNT); } SatelliteStats.SatelliteControllerParams controllerParam = builder.build(); logd("reportIncomingNtnSmsCount(): " + controllerParam); -- cgit v1.2.3-59-g8ed1b