Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "upperLayerIndicator_r15 is optional, nr state design changed" am: 0737c31dac

Browse Source 
Change-Id: Idee0e26ec0fe070e358698ccf7ebe4fa9e44c02d
This commit is contained in:
Automerger Merge Worker
2020-03-17 08:24:47 +00:00
parent d9649970f6 0737c31dac
commit e595809c46
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/NetworkRegistrationInfo.java
View File

@@ -291,7 +291,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) {
@@ -658,12 +658,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;