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

Commit 4581b354 authored by Taesu Lee's avatar Taesu Lee Committed by Amit Mahajan
Browse files

Fix SmsSession.Event.delay on SMS metrics 



The delay for incoming messages is fixed to show the relative delay of
events between each other based on SCTS(Service Center Time Stamp) in
PDU. And add service info on SMS metrics also.

Bug: 181091100
Test: dumpsys activity service TelephonyDebugService --metrics

Signed-off-by: default avatarTaesu Lee <taesu82.lee@samsung.com>
Change-Id: I927e7b18a85efd3716a8d6b68ebd9ea4653f00e7
parent 1b3b09e8

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+21 −7
Original line number Diff line number Diff line
@@ -487,7 +487,9 @@ public class TelephonyMetrics { 
            pw.print("Start time in minutes: " + callSession.startTimeMinutes);

            pw.print(", phone: " + callSession.phoneId);

            if (callSession.eventsDropped) {

                pw.println(" Events dropped: " + callSession.eventsDropped);

                pw.println(", events dropped: " + callSession.eventsDropped);

            } else {

                pw.println("");

            }



            pw.println("Events: ");
@@ -543,9 +545,16 @@ public class TelephonyMetrics { 
            for (SmsSession.Event event : smsSession.events) {

                pw.print(event.delay);

                pw.print(" T=");

                if (event.type == TelephonyCallSession.Event.Type.RIL_SERVICE_STATE_CHANGED) {

                    pw.println(smsSessionEventToString(event.type)

                            + "(" + "Data RAT " + event.serviceState.dataRat

                            + " Voice RAT " + event.serviceState.voiceRat

                            + " Channel Number " + event.serviceState.channelNumber

                            + " NR Frequency Range " + event.serviceState.nrFrequencyRange

                            + " NR State " + event.serviceState.nrState

                            + ")");

                } else if (event.type == SmsSession.Event.Type.SMS_RECEIVED) {

                    pw.println(smsSessionEventToString(event.type));

                // Only show more info for tx/rx sms

                if (event.type == SmsSession.Event.Type.SMS_RECEIVED) {

                    pw.increaseIndent();

                    switch (event.smsType) {

                        case SmsSession.Event.SmsType.SMS_TYPE_SMS_PP:
@@ -569,6 +578,7 @@ public class TelephonyMetrics { 
                    pw.decreaseIndent();

                } else if (event.type == SmsSession.Event.Type.SMS_SEND

                        || event.type == SmsSession.Event.Type.SMS_SEND_RESULT) {

                    pw.println(smsSessionEventToString(event.type));

                    pw.increaseIndent();

                    pw.println("ReqId=" + event.rilRequestId);

                    pw.println("E=" + event.errorCode);
@@ -576,6 +586,7 @@ public class TelephonyMetrics { 
                    pw.println("ImsE=" + event.imsError);

                    pw.decreaseIndent();

                } else if (event.type == SmsSession.Event.Type.INCOMPLETE_SMS_RECEIVED) {

                    pw.println(smsSessionEventToString(event.type));

                    pw.increaseIndent();

                    pw.println("Received: " + event.incompleteSms.receivedParts + "/"

                            + event.incompleteSms.totalParts);
@@ -2438,7 +2449,9 @@ public class TelephonyMetrics { 
        int smsTech = getSmsTech(smsSource, smsFormat == SmsSession.Event.Format.SMS_FORMAT_3GPP2);



        InProgressSmsSession smsSession = startNewSmsSession(phoneId);

        for (long time : timestamps) {



        long startElapsedTimeMillis = SystemClock.elapsedRealtime();

        for (int i = 0; i < timestamps.length; i++) {

            SmsSessionEventBuilder eventBuilder =

                    new SmsSessionEventBuilder(SmsSession.Event.Type.SMS_RECEIVED)

                        .setFormat(smsFormat)
@@ -2447,7 +2460,8 @@ public class TelephonyMetrics { 
                        .setSmsType(type)

                        .setBlocked(blocked)

                        .setMessageId(messageId);

            smsSession.addEvent(time, eventBuilder);

            long interval = (i > 0) ? timestamps[i] - timestamps[i - 1] : 0;

            smsSession.addEvent(startElapsedTimeMillis + interval, eventBuilder);

        }

        finishSmsSession(smsSession);

    }