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

Commit 77a58b76 authored by Naveen Kalla's avatar Naveen Kalla Committed by android-build-merger
Browse files

Merge "Add Channel number to the service state metrics" 

am: aa74afd8

Change-Id: I3e93f7e61210021a251d9153da3c8c5c7af90e33
parents 9e4e09d1 aa74afd8

proto/src/telephony.proto

+3 −0
Original line number Diff line number Diff line
@@ -279,6 +279,9 @@ message TelephonyServiceState { 


  // Current data radio technology

  optional RadioAccessTechnology data_rat = 6 [default = UNKNOWN];



  // Current Channel Number

  optional int32 channel_number = 7;

}



// Radio access families

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

+11 −4
Original line number Diff line number Diff line
@@ -412,7 +412,10 @@ public class TelephonyMetrics { 
            pw.print("T=");

            if (event.type == TelephonyEvent.Type.RIL_SERVICE_STATE_CHANGED) {

                pw.print(telephonyEventToString(event.type)

                        + "(" + event.serviceState.dataRat + ")");

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

                        + " Voice RAT " + event.serviceState.voiceRat

                        + " Channel Number " + event.serviceState.channelNumber

                        + ")");

            } else {

                pw.print(telephonyEventToString(event.type));

            }
@@ -438,7 +441,10 @@ public class TelephonyMetrics { 
                pw.print(" T=");

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

                    pw.println(callSessionEventToString(event.type)

                            + "(" + event.serviceState.dataRat + ")");

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

                            + " Voice RAT " + event.serviceState.voiceRat

                            + " Channel Number " + event.serviceState.channelNumber

                            + ")");

                } else if (event.type == TelephonyCallSession.Event.Type.RIL_CALL_LIST_CHANGED) {

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

                    pw.increaseIndent();
@@ -882,6 +888,7 @@ public class TelephonyMetrics { 


        ssProto.voiceRat = serviceState.getRilVoiceRadioTechnology();

        ssProto.dataRat = serviceState.getRilDataRadioTechnology();

        ssProto.channelNumber = serviceState.getChannelNumber();

        return ssProto;

    }