Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25733b2e authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "Do put demo mode messages into SOS count" into main

parents b8d58e68 9c8d9d5d

src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java

+14 −16
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ public class ControllerMetricsStats { 
            builder.setCountOfDemoModeOutgoingDatagramSuccess(ADD_COUNT);

        } else {

            builder.setCountOfOutgoingDatagramSuccess(ADD_COUNT);

        }



            if (SatelliteServiceUtils.isSosMessage(datagramType)) {

                builder.setCountOfDatagramTypeSosSmsSuccess(ADD_COUNT);

            } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_LOCATION_SHARING) {
@@ -150,6 +148,7 @@ public class ControllerMetricsStats { 
            } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_KEEP_ALIVE) {

                builder.setCountOfDatagramTypeKeepAliveSuccess(ADD_COUNT).build();

            }

        }



        SatelliteStats.SatelliteControllerParams controllerParam = builder.build();

        logd("reportServiceEnablementSuccessCount(): " + controllerParam);
@@ -166,8 +165,6 @@ public class ControllerMetricsStats { 
            builder.setCountOfDemoModeOutgoingDatagramFail(ADD_COUNT);

        } else {

            builder.setCountOfOutgoingDatagramFail(ADD_COUNT);

        }



            if (SatelliteServiceUtils.isSosMessage(datagramType)) {

                builder.setCountOfDatagramTypeSosSmsFail(ADD_COUNT);

            } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_LOCATION_SHARING) {
@@ -175,6 +172,7 @@ public class ControllerMetricsStats { 
            } else if (datagramType == SatelliteManager.DATAGRAM_TYPE_KEEP_ALIVE) {

                builder.setCountOfDatagramTypeKeepAliveFail(ADD_COUNT);

            }

        }



        SatelliteStats.SatelliteControllerParams controllerParam = builder.build();

        logd("reportOutgoingDatagramFailCount(): " + controllerParam);

tests/telephonytests/src/com/android/internal/telephony/satellite/ControllerMetricsStatsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class ControllerMetricsStatsTest extends TelephonyTest { 
        assertEquals(0, mTestStats.mCountOfIncomingDatagramFail);

        assertEquals(0, mTestStats.mCountOfDatagramTypeSosSmsSuccess);

        assertEquals(0, mTestStats.mCountOfDatagramTypeSosSmsFail);

        assertEquals(10, mTestStats.mCountOfDatagramTypeLocationSharingSuccess);

        assertEquals(0, mTestStats.mCountOfDatagramTypeLocationSharingSuccess);

        assertEquals(0, mTestStats.mCountOfDatagramTypeLocationSharingFail);

        assertEquals(0, mTestStats.mCountOfProvisionSuccess);

        assertEquals(0, mTestStats.mCountOfProvisionFail);
@@ -282,7 +282,7 @@ public class ControllerMetricsStatsTest extends TelephonyTest { 
        assertEquals(0, mTestStats.mCountOfDatagramTypeSosSmsSuccess);

        assertEquals(0, mTestStats.mCountOfDatagramTypeSosSmsFail);

        assertEquals(0, mTestStats.mCountOfDatagramTypeLocationSharingSuccess);

        assertEquals(10, mTestStats.mCountOfDatagramTypeLocationSharingFail);

        assertEquals(0, mTestStats.mCountOfDatagramTypeLocationSharingFail);

        assertEquals(0, mTestStats.mCountOfProvisionSuccess);

        assertEquals(0, mTestStats.mCountOfProvisionFail);

        assertEquals(0, mTestStats.mCountOfDeprovisionSuccess);