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

Commit 2f8bf3a0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Satellite] Reset the counter stats at the beginning of the session." into main

parents 8b2cf482 7d793155

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+1 −1
Original line number Diff line number Diff line
@@ -1296,8 +1296,8 @@ public class SatelliteController extends Handler { 
                    // If Satellite enable/disable request returned Error, no need to wait for radio

                    argument.callback.accept(error);

                }



                if (argument.enableSatellite) {

                    mSessionMetricsStats.resetSessionStatsShadowCounters();

                    mSessionMetricsStats.setInitializationResult(error)

                            .setSatelliteTechnology(getSupportedNtnRadioTechnology())

                            .setInitializationProcessingTime(

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

+20 −4
Original line number Diff line number Diff line
@@ -46,9 +46,13 @@ public class SessionMetricsStats { 
    private long mTerminationProcessingTimeMillis;

    private int mSessionDurationSec;

    private int mCountOfSuccessfulOutgoingDatagram;

    private int mShadowCountOfSuccessfulOutgoingDatagram;

    private int mCountOfFailedOutgoingDatagram;

    private int mShadowCountOfFailedOutgoingDatagram;

    private int mCountOfTimedOutUserMessagesWaitingForConnection;

    private int mShadowCountOfTimedOutUserMessagesWaitingForConnection;

    private int mCountOfTimedOutUserMessagesWaitingForAck;

    private int mShadowCountOfTimedOutUserMessagesWaitingForAck;

    private int mCountOfSuccessfulIncomingDatagram;

    private int mCountOfIncomingDatagramFailed;

    private boolean mIsDemoMode;
@@ -131,6 +135,7 @@ public class SessionMetricsStats { 
        }



        mCountOfSuccessfulOutgoingDatagram++;

        mShadowCountOfSuccessfulOutgoingDatagram++;

        logd("addCountOfSuccessfulOutgoingDatagram: current count="

                + mCountOfSuccessfulOutgoingDatagram);

        return this;
@@ -146,6 +151,7 @@ public class SessionMetricsStats { 
        }



        mCountOfFailedOutgoingDatagram++;

        mShadowCountOfFailedOutgoingDatagram++;

        logd("addCountOfFailedOutgoingDatagram: current count=" + mCountOfFailedOutgoingDatagram);



        if (resultCode == SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE) {
@@ -166,6 +172,7 @@ public class SessionMetricsStats { 
        }



        mCountOfTimedOutUserMessagesWaitingForConnection++;

        mShadowCountOfTimedOutUserMessagesWaitingForConnection++;

        logd("addCountOfTimedOutUserMessagesWaitingForConnection: current count="

                + mCountOfTimedOutUserMessagesWaitingForConnection);

        return this;
@@ -180,6 +187,7 @@ public class SessionMetricsStats { 
        }



        mCountOfTimedOutUserMessagesWaitingForAck++;

        mShadowCountOfTimedOutUserMessagesWaitingForAck++;

        logd("addCountOfTimedOutUserMessagesWaitingForAck: current count="

                + mCountOfTimedOutUserMessagesWaitingForAck);

        return this;
@@ -278,12 +286,12 @@ public class SessionMetricsStats { 
    public void requestSatelliteSessionStats(int subId, @NonNull ResultReceiver result) {

        Bundle bundle = new Bundle();

        SatelliteSessionStats sessionStats = new SatelliteSessionStats.Builder()

                .setCountOfSuccessfulUserMessages(mCountOfSuccessfulOutgoingDatagram)

                .setCountOfUnsuccessfulUserMessages(mCountOfFailedOutgoingDatagram)

                .setCountOfSuccessfulUserMessages(mShadowCountOfSuccessfulOutgoingDatagram)

                .setCountOfUnsuccessfulUserMessages(mShadowCountOfFailedOutgoingDatagram)

                .setCountOfTimedOutUserMessagesWaitingForConnection(

                        mCountOfTimedOutUserMessagesWaitingForConnection)

                        mShadowCountOfTimedOutUserMessagesWaitingForConnection)

                .setCountOfTimedOutUserMessagesWaitingForAck(

                        mCountOfTimedOutUserMessagesWaitingForAck)

                        mShadowCountOfTimedOutUserMessagesWaitingForAck)

                .setCountOfUserMessagesInQueueToBeSent(

                        DatagramDispatcher.getInstance().getPendingUserMessagesCount())

                .build();
@@ -322,6 +330,14 @@ public class SessionMetricsStats { 
        mCountOfAutoExitDueToTnNetwork = 0;

    }



    public void resetSessionStatsShadowCounters() {

        logd("resetTheStatsCounters");

        mShadowCountOfSuccessfulOutgoingDatagram = 0;

        mShadowCountOfFailedOutgoingDatagram = 0;

        mShadowCountOfTimedOutUserMessagesWaitingForConnection = 0;

        mShadowCountOfTimedOutUserMessagesWaitingForAck = 0;

    }



    private static void logd(@NonNull String log) {

        if (DBG) {

            Log.d(TAG, log);