Merge changes from topic "phone_info_5g" (20c0cd6b) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/NetworkRegistrationInfo.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -594,7 +594,8 @@ public final class NetworkRegistrationInfo implements Parcelable {
		return "Unknown reg state " + registrationState;
		}

		private static String nrStateToString(@NRState int nrState) {
		/** @hide */
		public static String nrStateToString(@NRState int nrState) {
		switch (nrState) {
		case NR_STATE_RESTRICTED:
		return "RESTRICTED";

+4 −4

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package android.telephony;
		import android.annotation.IntDef;
		import android.os.Parcel;
		import android.os.Parcelable;

		import android.telephony.Annotation.NetworkType;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Arrays;
		@@ -241,13 +241,13 @@ public final class PhysicalChannelConfig implements Parcelable {
		.append(",mCellBandwidthDownlinkKhz=")
		.append(mCellBandwidthDownlinkKhz)
		.append(",mRat=")
		.append(mRat)
		.append(TelephonyManager.getNetworkTypeName(mRat))
		.append(",mFrequencyRange=")
		.append(mFrequencyRange)
		.append(ServiceState.frequencyRangeToString(mFrequencyRange))
		.append(",mChannelNumber=")
		.append(mChannelNumber)
		.append(",mContextIds=")
		.append(mContextIds.toString())
		.append(Arrays.toString(mContextIds))
		.append(",mPhysicalCellId=")
		.append(mPhysicalCellId)
		.append("}")

+20 −0

Original line number	Diff line number	Diff line
		@@ -1032,6 +1032,26 @@ public class ServiceState implements Parcelable {
		return rtString;
		}

		/**
		* Convert frequency range into string
		*
		* @param range The cellular frequency range
		* @return Frequency range in string format
		*
		* @hide
		*/
		public static @NonNull String frequencyRangeToString(@FrequencyRange int range) {
		switch (range) {
		case FREQUENCY_RANGE_UNKNOWN: return "UNKNOWN";
		case FREQUENCY_RANGE_LOW: return "LOW";
		case FREQUENCY_RANGE_MID: return "MID";
		case FREQUENCY_RANGE_HIGH: return "HIGH";
		case FREQUENCY_RANGE_MMWAVE: return "MMWAVE";
		default:
		return Integer.toString(range);
		}
		}

		/**
		* Convert RIL Service State to String
		*