Merge cherrypicks of ['googleplex-android-review.googlesource.com/32798805'] into 25Q2-release.

Change-Id: Iecf9e00d122f9298021bbfc92548637a9371d077

1 files 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);