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

Merge changes from topic "phone_info_5g"

Browse Source 
* changes:
  Expose NR State string method for use in RadioInfo
  Fixed unreadble debug messages
This commit is contained in:
Sarah Chin
2020-07-23 19:08:50 +00:00
committed by Gerrit Code Review
parent df9bf16543 f39b4cbec1
commit 20c0cd6b4c
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -594,7 +594,8 @@ public final class NetworkRegistrationInfo implements Parcelable {
return "Unknown reg state " + registrationState; return "Unknown reg state " + registrationState;
} }
private static String nrStateToString(@NRState int nrState) { /** @hide */
public static String nrStateToString(@NRState int nrState) {
switch (nrState) { switch (nrState) {
case NR_STATE_RESTRICTED: case NR_STATE_RESTRICTED:
return "RESTRICTED"; return "RESTRICTED";

8
telephony/java/android/telephony/PhysicalChannelConfig.java
View File

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

20
telephony/java/android/telephony/ServiceState.java
View File

@@ -1032,6 +1032,26 @@ public class ServiceState implements Parcelable {
return rtString; 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 * Convert RIL Service State to String
* *