Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev (6e6e2330) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/NetworkRegistrationInfo.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -297,7 +297,7 @@ public final class NetworkRegistrationInfo implements Parcelable {
	mDataSpecificInfo = new DataSpecificRegistrationInfo(		mDataSpecificInfo = new DataSpecificRegistrationInfo(
	maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable, lteVopsSupportInfo,		maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable, lteVopsSupportInfo,
	isUsingCarrierAggregation);		isUsingCarrierAggregation);
	updateNrState(mDataSpecificInfo);		updateNrState();
	}		}

	private NetworkRegistrationInfo(Parcel source) {		private NetworkRegistrationInfo(Parcel source) {
	@@ -686,12 +686,12 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* DCNR is not restricted and NR is supported by the selected PLMN. Otherwise the use of 5G		* DCNR is not restricted and NR is supported by the selected PLMN. Otherwise the use of 5G
	* NR is restricted.		* NR is restricted.
	*		*
	* @param state data specific registration state contains the 5G NR indicators.		* @hide
	*/		*/
	private void updateNrState(DataSpecificRegistrationInfo state) {		public void updateNrState() {
	mNrState = NR_STATE_NONE;		mNrState = NR_STATE_NONE;
	if (state.isEnDcAvailable) {		if (mDataSpecificInfo.isEnDcAvailable) {
	if (!state.isDcNrRestricted && state.isNrAvailable) {		if (!mDataSpecificInfo.isDcNrRestricted && mDataSpecificInfo.isNrAvailable) {
	mNrState = NR_STATE_NOT_RESTRICTED;		mNrState = NR_STATE_NOT_RESTRICTED;
	} else {		} else {
	mNrState = NR_STATE_RESTRICTED;		mNrState = NR_STATE_RESTRICTED;