Merge "[DO NOT MERGE] Revert "Add NrState and NrFrequency to telephony metrics"" into qt-qpr1-dev (2109a63f) · Commits · e / os / android_frameworks_opt_telephony

proto/src/telephony.proto

+0 −44

Original line number	Diff line number	Diff line
		@@ -262,44 +262,6 @@ message TelephonyServiceState {
		ROAMING_TYPE_INTERNATIONAL = 3;
		}

		enum FrequencyRange {
		// Unknown. The default value.
		FREQUENCY_RANGE_UNKNOWN = -1;

		// Frequency range is below 1GHz.
		FREQUENCY_RANGE_LOW = 1;

		// Frequency range is between 1GHz and 3GHz.
		FREQUENCY_RANGE_MID = 2;

		// Frequency range is between 3GHz and 6GHz.
		FREQUENCY_RANGE_HIGH = 3;

		// Frequency range is above 6GHz (millimeter wave frequency).
		FREQUENCY_RANGE_MMWAVE = 4;
		}

		enum NrState {
		// The device isn't camped on an LTE cell
		// or the LTE cell doesn't support EN-DC.
		NR_STATE_NONE = -1;

		// The device is camped on an LTE cell that supports EN-DC
		// but either DCNR is restricted
		// or NR is not supported by the selected PLMN.
		NR_STATE_RESTRICTED = 1;

		// The device is camped on an LTE cell that supports EN-DC
		// and both DCNR is not restricted and NR is supported
		// by the selected PLMN.
		NR_STATE_NOT_RESTRICTED = 2;

		// The device is camped on an LTE cell that supports EN-DC
		// and connected to at least one 5G cell
		// as a secondary serving cell.
		NR_STATE_CONNECTED = 3;
		}

		// Current registered operator
		optional TelephonyOperator voice_operator = 1;

		@@ -320,12 +282,6 @@ message TelephonyServiceState {

		// Current Channel Number
		optional int32 channel_number = 7;

		// Current NR frequency range
		optional FrequencyRange nr_frequency_range = 8;

		// Current NR state
		optional NrState nr_state = 9;
		}

		// Radio access families

src/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -1567,8 +1567,6 @@ public class ServiceStateTracker extends Handler {
		if (hasChanged
		\|\| RatRatcheter.updateBandwidths(getBandwidthsFromConfigs(list), mSS)) {
		mPhone.notifyServiceStateChanged(mSS);
		TelephonyMetrics.getInstance().writeServiceStateChanged(
		mPhone.getPhoneId(), mSS);
		}
		}
		break;
		@@ -2138,7 +2136,6 @@ public class ServiceStateTracker extends Handler {
		int serviceState = regCodeToServiceState(registrationState);
		int newDataRat = ServiceState.networkTypeToRilRadioTechnology(
		networkRegState.getAccessNetworkTechnology());
		boolean nrHasChanged = false;

		if (DBG) {
		log("handlePollStateResultMessage: PS cellular. " + networkRegState);
		@@ -2149,17 +2146,11 @@ public class ServiceStateTracker extends Handler {
		// (2 or more cells) to a new cell if they camp for emergency service only.
		if (serviceState == ServiceState.STATE_OUT_OF_SERVICE) {
		mLastPhysicalChannelConfigList = null;
		nrHasChanged \|= updateNrFrequencyRangeFromPhysicalChannelConfigs(null, mNewSS);
		updateNrFrequencyRangeFromPhysicalChannelConfigs(null, mNewSS);
		}
		nrHasChanged \|= updateNrStateFromPhysicalChannelConfigs(
		mLastPhysicalChannelConfigList, mNewSS);
		updateNrStateFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);
		setPhyCellInfoFromCellIdentity(mNewSS, networkRegState.getCellIdentity());

		if (nrHasChanged) {
		TelephonyMetrics.getInstance().writeServiceStateChanged(
		mPhone.getPhoneId(), mSS);
		}

		if (mPhone.isPhoneTypeGsm()) {

		mNewReasonDataDenied = networkRegState.getRejectCause();
		@@ -3402,9 +3393,7 @@ public class ServiceStateTracker extends Handler {
		mPhone.getContext().getContentResolver()
		.insert(getUriForSubscriptionId(mPhone.getSubId()),
		getContentValuesForServiceState(mSS));
		}

		if (hasChanged \|\| hasNrStateChanged) {
		TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);
		}

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -433,8 +433,6 @@ public class TelephonyMetrics {
		+ "(" + "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 {
		pw.print(telephonyEventToString(event.type));
		@@ -464,8 +462,6 @@ public class TelephonyMetrics {
		+ "(" + "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 == TelephonyCallSession.Event.Type.RIL_CALL_LIST_CHANGED) {
		pw.println(callSessionEventToString(event.type));
		@@ -915,8 +911,6 @@ public class TelephonyMetrics {
		ssProto.voiceRat = serviceState.getRilVoiceRadioTechnology();
		ssProto.dataRat = serviceState.getRilDataRadioTechnology();
		ssProto.channelNumber = serviceState.getChannelNumber();
		ssProto.nrFrequencyRange = serviceState.getNrFrequencyRange();
		ssProto.nrState = serviceState.getNrState();
		return ssProto;
		}