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

Merge "Fixed unreadble debug messages" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-13 02:23:16 +00:00
committed by Android (Google) Code Review
parent 298dd714eb e7580a7238
commit 9ff2625493
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
telephony/java/android/telephony/ServiceState.java
View File

@@ -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
*