Merge "Add Channel number to the service state metrics" am: aa74afd8fa am: 77a58b7678 (4f3df722) · Commits · e / os / android_frameworks_opt_telephony

proto/src/telephony.proto

+3 −0

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

	// Current data radio technology		// Current data radio technology
	optional RadioAccessTechnology data_rat = 6 [default = UNKNOWN];		optional RadioAccessTechnology data_rat = 6 [default = UNKNOWN];

			// Current Channel Number
			optional int32 channel_number = 7;
	}		}

	// Radio access families		// Radio access families

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

+11 −4

Original line number	Original line	Diff line number	Diff line
	@@ -422,7 +422,10 @@ public class TelephonyMetrics {
	pw.print("T=");		pw.print("T=");
	if (event.type == TelephonyEvent.Type.RIL_SERVICE_STATE_CHANGED) {		if (event.type == TelephonyEvent.Type.RIL_SERVICE_STATE_CHANGED) {
	pw.print(telephonyEventToString(event.type)		pw.print(telephonyEventToString(event.type)
	+ "(" + event.serviceState.dataRat + ")");		+ "(" + "Data RAT " + event.serviceState.dataRat
			+ " Voice RAT " + event.serviceState.voiceRat
			+ " Channel Number " + event.serviceState.channelNumber
			+ ")");
	} else {		} else {
	pw.print(telephonyEventToString(event.type));		pw.print(telephonyEventToString(event.type));
	}		}
	@@ -448,7 +451,10 @@ public class TelephonyMetrics {
	pw.print(" T=");		pw.print(" T=");
	if (event.type == TelephonyCallSession.Event.Type.RIL_SERVICE_STATE_CHANGED) {		if (event.type == TelephonyCallSession.Event.Type.RIL_SERVICE_STATE_CHANGED) {
	pw.println(callSessionEventToString(event.type)		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) {		} else if (event.type == TelephonyCallSession.Event.Type.RIL_CALL_LIST_CHANGED) {
	pw.println(callSessionEventToString(event.type));		pw.println(callSessionEventToString(event.type));
	pw.increaseIndent();		pw.increaseIndent();
	@@ -892,6 +898,7 @@ public class TelephonyMetrics {

	ssProto.voiceRat = serviceState.getRilVoiceRadioTechnology();		ssProto.voiceRat = serviceState.getRilVoiceRadioTechnology();
	ssProto.dataRat = serviceState.getRilDataRadioTechnology();		ssProto.dataRat = serviceState.getRilDataRadioTechnology();
			ssProto.channelNumber = serviceState.getChannelNumber();
	return ssProto;		return ssProto;
	}		}