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

Commit 67f3152f authored by Jordan Liu's avatar Jordan Liu
Browse files

Add call quality metrics to telephony.proto 

Bug: 128356481
Test: atest InProgressCallSessionTest
Change-Id: Id1b79b88b53353e9a1d7bb2c7561c824205be45e
parent 9d58b7b2

proto/src/telephony.proto

+139 −0
Original line number Original line Diff line number Diff line
@@ -1775,6 +1775,9 @@ message TelephonyCallSession { 




      // Change of audio codec

      // Change of audio codec

      AUDIO_CODEC = 22;

      AUDIO_CODEC = 22;



      // Notification that the call quality has changed

      CALL_QUALITY_CHANGED = 23;

    }

    }





    enum RilRequest {

    enum RilRequest {
@@ -1959,6 +1962,135 @@ message TelephonyCallSession { 
      HANDOVER_CANCELED = 4;

      HANDOVER_CANCELED = 4;

    }

    }





    message SignalStrength {



      // signal to noise ratio for LTE signal strength

      optional int32 lte_snr = 1;



      // in the future we may include more measures of signal strength, or

      // measurements for other RATs

    }



    // CallQuality information. (This proto class corresponds to

    // android.telephony.CallQuality)

    message CallQuality {



      enum CallQualityLevel {



        // leaving the first value explicitly as unspecified avoids breaking

        // clients if the desired default behavior changes

        UNDEFINED = 0;



        EXCELLENT = 1;



        GOOD = 2;



        FAIR = 3;



        POOR = 4;



        BAD = 5;



        // this typically indicates a failure in the modem

        NOT_AVAILABLE = 6;

      }



      // the downlink CallQualityLevel for a given ongoing call

      optional CallQualityLevel downlink_level = 1;



      // the uplink CallQualityLevel for a given ongoing call

      optional CallQualityLevel uplink_level = 2;



      // the duration of the call, in seconds

      optional int32 duration_in_seconds = 3;



      // the total number of RTP packets transmitted by this device for an

      // ongoing call

      optional int32 rtp_packets_transmitted = 4;



      // the total number of RTP packets received by this device for an ongoing

      // call

      optional int32 rtp_packets_received = 5;



      // the number of RTP packets which were sent by this device but were lost

      // in the network before reaching the other party

      optional int32 rtp_packets_transmitted_lost = 6;



      // the number of RTP packets which were sent by the other party but were

      // lost in the network before reaching this device

      optional int32 rtp_packets_not_received = 7;



      // the average relative jitter in milliseconds. Jitter represents the

      // amount of variance in interarrival time of packets, for example, if two

      // packets are sent 2 milliseconds apart but received 3 milliseconds

      // apart, the relative jitter between those packets is 1 millisecond.

      //

      // See RFC 3550 for more information on jitter calculations

      optional int32 average_relative_jitter_millis = 8;



      // the maximum relative jitter for a given ongoing call. Jitter represents

      // the amount of variance in interarrival time of packets, for example, if

      // two packets are sent 2 milliseconds apart but received 3 milliseconds

      // apart, the relative jitter between those packets is 1 millisecond.

      //

      // See RFC 3550 for more information on jitter calculations.

      optional int32 max_relative_jitter_millis = 9;



      // the average round trip time of RTP packets in an ongoing call, in milliseconds

      optional int32 average_round_trip_time = 10;



      // the codec type of an ongoing call

      optional AudioCodec codec_type = 11;

    }



    message CallQualitySummary {



      // Total duration of good call quality reported at the end of a call

      optional int32 total_good_quality_duration_in_seconds = 1;



      // Total duration of bad call quality reported at the end of a call

      optional int32 total_bad_quality_duration_in_seconds = 2;



      // Total duration of the call for which we have call quality

      // information, reported at the end of a call. For example, if an IMS call

      // is converted to a CS call, which doesn't report call quality information,

      // this value is the duration of the IMS component.

      optional int32 total_duration_with_quality_information_in_seconds = 3;



      // Snapshot of the CallQuality when signal strength is worst within good

      // quality section

      optional CallQuality snapshot_of_worst_ss_with_good_quality = 4;



      // Snapshot of the CallQuality when signal strength is best within good

      // quality section

      optional CallQuality snapshot_of_best_ss_with_good_quality = 5;



      // Snapshot of the CallQuality when signal strength is worst within bad

      // quality section

      optional CallQuality snapshot_of_worst_ss_with_bad_quality = 6;



      // Snapshot of the CallQuality when signal strength is best within bad

      // quality section

      optional CallQuality snapshot_of_best_ss_with_bad_quality = 7;



      // The worst SignalStrength in any good quality section

      optional SignalStrength worst_ss_with_good_quality = 8;



      // The best SignalStrength in any good quality section

      optional SignalStrength best_ss_with_good_quality = 9;



      // The worst SignalStrength in any bad quality section

      optional SignalStrength worst_ss_with_bad_quality = 10;



      // The best SignalStrength in any bad quality section

      optional SignalStrength best_ss_with_bad_quality = 11;



      // Snapshot of the CallQuality at the end of a call. This includes

      // cumulative statistics like total duration and total RTP packets.

      optional CallQuality snapshot_of_end = 12;



    }



    // Event type

    // Event type

    optional Type type = 1;

    optional Type type = 1;
@@ -2024,6 +2156,13 @@ message TelephonyCallSession { 




    // Audio codec at the beginning of the session or when changed

    // Audio codec at the beginning of the session or when changed

    optional AudioCodec audio_codec = 22;

    optional AudioCodec audio_codec = 22;



    // Call quality when changed

    optional CallQuality call_quality = 23;



    // Call quality summary at the end of a call

    optional CallQualitySummary call_quality_summary = 24;



  }

  }





  // Time when call has started, in minutes since epoch,

  // Time when call has started, in minutes since epoch,

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ import com.android.internal.telephony.nano.TelephonyProto.ImsConnectionState; 
import com.android.internal.telephony.nano.TelephonyProto.ImsReasonInfo;

import com.android.internal.telephony.nano.TelephonyProto.ImsReasonInfo;

import com.android.internal.telephony.nano.TelephonyProto.RilDataCall;

import com.android.internal.telephony.nano.TelephonyProto.RilDataCall;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.CallQuality;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.CallQualitySummary;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.RilCall;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.RilCall;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyServiceState;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyServiceState;

import com.android.internal.telephony.nano.TelephonyProto.TelephonySettings;

import com.android.internal.telephony.nano.TelephonyProto.TelephonySettings;
@@ -136,4 +138,16 @@ public class CallSessionEventBuilder { 
        mEvent.audioCodec = audioCodec;

        mEvent.audioCodec = audioCodec;

        return this;

        return this;

    }

    }



    /** Set the call quality. */

    public CallSessionEventBuilder setCallQuality(CallQuality callQuality) {

        mEvent.callQuality = callQuality;

        return this;

    }



    /** Set the signal strength. */

    public CallSessionEventBuilder setCallQualitySummary(CallQualitySummary callQualitySummary) {

        mEvent.callQualitySummary = callQualitySummary;

        return this;

    }

}
 
}

tests/telephonytests/src/com/android/internal/telephony/metrics/InProgressCallSessionTest.java

+57 −4
Original line number Original line Diff line number Diff line
@@ -16,19 +16,22 @@ 




package com.android.internal.telephony.metrics;

package com.android.internal.telephony.metrics;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;





import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.nano.TelephonyProto;

import com.android.internal.telephony.nano.TelephonyProto;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.CallQuality;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.CallQualitySummary;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.SignalStrength;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



public class InProgressCallSessionTest extends TelephonyTest {

public class InProgressCallSessionTest extends TelephonyTest {





    private InProgressCallSession mCallSession;

    private InProgressCallSession mCallSession;
@@ -74,4 +77,54 @@ public class InProgressCallSessionTest extends TelephonyTest { 
        assertTrue(mCallSession.isEventsDropped());

        assertTrue(mCallSession.isEventsDropped());

        assertEquals(2, mCallSession.events.getFirst().rilRequestId);

        assertEquals(2, mCallSession.events.getFirst().rilRequestId);

    }

    }



    @Test

    @SmallTest

    public void testAddCallQualityEvent() {

        CallQuality cq = new CallQuality();

        cq.downlinkLevel = CallQuality.CallQualityLevel.GOOD;

        cq.uplinkLevel = CallQuality.CallQualityLevel.GOOD;

        CallSessionEventBuilder builder = new CallSessionEventBuilder(

                TelephonyProto.TelephonyCallSession.Event.Type.CALL_QUALITY_CHANGED)

                .setCallQuality(cq);

        mCallSession.addEvent(builder);

        assertEquals(builder.build(), mCallSession.events.getFirst());

    }



    @Test

    @SmallTest

    public void testAddCallQualitySummaryEvent() {

        SignalStrength ss1 = new SignalStrength();

        ss1.lteSnr = 22;



        SignalStrength ss2 = new SignalStrength();

        ss2.lteSnr = 44;



        CallQuality cq1 = new CallQuality();

        cq1.downlinkLevel = CallQuality.CallQualityLevel.GOOD;

        cq1.uplinkLevel = CallQuality.CallQualityLevel.GOOD;



        CallQuality cq2 = new CallQuality();

        cq1.downlinkLevel = CallQuality.CallQualityLevel.BAD;

        cq1.uplinkLevel = CallQuality.CallQualityLevel.BAD;



        CallQualitySummary cqs = new CallQualitySummary();

        cqs.totalGoodQualityDurationInSeconds = 2;

        cqs.totalBadQualityDurationInSeconds = 3;

        cqs.totalDurationWithQualityInformationInSeconds = 5;

        cqs.snapshotOfWorstSsWithGoodQuality = cq2;

        cqs.snapshotOfBestSsWithGoodQuality = cq2;

        cqs.snapshotOfWorstSsWithBadQuality = cq1;

        cqs.snapshotOfBestSsWithBadQuality = cq1;

        cqs.worstSsWithGoodQuality = ss1;

        cqs.bestSsWithGoodQuality = ss2;

        cqs.worstSsWithBadQuality = ss1;

        cqs.bestSsWithBadQuality = ss2;



        CallSessionEventBuilder builder = new CallSessionEventBuilder(

                TelephonyProto.TelephonyCallSession.Event.Type.CALL_QUALITY_CHANGED)

                .setCallQualitySummary(cqs);

        mCallSession.addEvent(builder);

        assertEquals(builder.build(), mCallSession.events.getFirst());

    }

}
 
}