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

Commit d4ef8e84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff26254 am:... 

Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff26254 am: 514e8d96 am: cbdecba2 am: 56f618e0

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

Change-Id: Idc65d830cec426d948b20c13a4c156085d351391
parents 1386006d 56f618e0

telephony/java/android/telephony/PhysicalChannelConfig.java

+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("}")

telephony/java/android/telephony/ServiceState.java

+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

     *