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" into rvc-dev am: 6e6e233019 am: fbb59c06bb

Browse Source 
Change-Id: Ic1bc32d0f1c825f6fcc858889f4afef8e7d1163d
This commit is contained in:
Automerger Merge Worker
2020-03-17 03:06:39 +00:00
parent 5c94eb7b89 fbb59c06bb
commit fb65e1422e
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

@@ -297,7 +297,7 @@ public final class NetworkRegistrationInfo implements Parcelable {
mDataSpecificInfo = new DataSpecificRegistrationInfo(
maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable, lteVopsSupportInfo,
isUsingCarrierAggregation);
updateNrState(mDataSpecificInfo);
updateNrState();
}
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
* 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;
if (state.isEnDcAvailable) {
if (!state.isDcNrRestricted && state.isNrAvailable) {
if (mDataSpecificInfo.isEnDcAvailable) {
if (!mDataSpecificInfo.isDcNrRestricted && mDataSpecificInfo.isNrAvailable) {
mNrState = NR_STATE_NOT_RESTRICTED;
} else {
mNrState = NR_STATE_RESTRICTED;