Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6359b5a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Kibosh the NrState Strings" am: 7e42554a am: 959570eb am: 0009280c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998

Change-Id: Ib547b888721297104b2652ef791404f439d7b301
parents b90d33bd 0009280c

telephony/java/android/telephony/NetworkRegistrationInfo.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.AccessNetworkConstants.TransportType;
@@ -635,7 +636,8 @@ public final class NetworkRegistrationInfo implements Parcelable { 
                .append(" cellIdentity=").append(mCellIdentity)

                .append(" cellIdentity=").append(mCellIdentity)

                .append(" voiceSpecificInfo=").append(mVoiceSpecificInfo)

                .append(" voiceSpecificInfo=").append(mVoiceSpecificInfo)

                .append(" dataSpecificInfo=").append(mDataSpecificInfo)

                .append(" dataSpecificInfo=").append(mDataSpecificInfo)

                .append(" nrState=").append(nrStateToString(mNrState))

                .append(" nrState=").append(Build.IS_DEBUGGABLE

                        ? nrStateToString(mNrState) : "****")

                .append(" rRplmn=").append(mRplmn)

                .append(" rRplmn=").append(mRplmn)

                .append(" isUsingCarrierAggregation=").append(mIsUsingCarrierAggregation)

                .append(" isUsingCarrierAggregation=").append(mIsUsingCarrierAggregation)

                .append("}").toString();

                .append("}").toString();

telephony/java/android/telephony/ServiceState.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1102,7 +1102,8 @@ public class ServiceState implements Parcelable { 
                    .append(", isUsingCarrierAggregation=").append(isUsingCarrierAggregation())

                    .append(", isUsingCarrierAggregation=").append(isUsingCarrierAggregation())

                    .append(", mLteEarfcnRsrpBoost=").append(mLteEarfcnRsrpBoost)

                    .append(", mLteEarfcnRsrpBoost=").append(mLteEarfcnRsrpBoost)

                    .append(", mNetworkRegistrationInfos=").append(mNetworkRegistrationInfos)

                    .append(", mNetworkRegistrationInfos=").append(mNetworkRegistrationInfos)

                    .append(", mNrFrequencyRange=").append(mNrFrequencyRange)

                    .append(", mNrFrequencyRange=").append(Build.IS_DEBUGGABLE

                            ? mNrFrequencyRange : FREQUENCY_RANGE_UNKNOWN)

                    .append(", mOperatorAlphaLongRaw=").append(mOperatorAlphaLongRaw)

                    .append(", mOperatorAlphaLongRaw=").append(mOperatorAlphaLongRaw)

                    .append(", mOperatorAlphaShortRaw=").append(mOperatorAlphaShortRaw)

                    .append(", mOperatorAlphaShortRaw=").append(mOperatorAlphaShortRaw)

                    .append(", mIsDataRoamingFromRegistration=")

                    .append(", mIsDataRoamingFromRegistration=")