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

Commit 8f9f382c authored by Pengquan Meng's avatar Pengquan Meng Committed by Gerrit Code Review
Browse files

Merge "Add 5G rat type"

parents 06dcff96 6b849c2a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43086,6 +43086,7 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_IDEN = 11; // 0xb

    field public static final int NETWORK_TYPE_IWLAN = 18; // 0x12

    field public static final int NETWORK_TYPE_LTE = 13; // 0xd

    field public static final int NETWORK_TYPE_NR = 20; // 0x14

    field public static final int NETWORK_TYPE_TD_SCDMA = 17; // 0x11

    field public static final int NETWORK_TYPE_UMTS = 3; // 0x3

    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5439,6 +5439,7 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_BITMASK_HSUPA = 512; // 0x200

    field public static final int NETWORK_TYPE_BITMASK_LTE = 8192; // 0x2000

    field public static final int NETWORK_TYPE_BITMASK_LTE_CA = 524288; // 0x80000

    field public static final int NETWORK_TYPE_BITMASK_NR = 1048576; // 0x100000

    field public static final int NETWORK_TYPE_BITMASK_TD_SCDMA = 131072; // 0x20000

    field public static final int NETWORK_TYPE_BITMASK_UMTS = 8; // 0x8

    field public static final int NETWORK_TYPE_BITMASK_UNKNOWN = 1; // 0x1

core/proto/android/telephony/enums.proto

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ enum NetworkTypeEnum { 
    NETWORK_TYPE_TD_SCDMA = 17;

    NETWORK_TYPE_IWLAN = 18;

    NETWORK_TYPE_LTE_CA = 19;

    NETWORK_TYPE_NR = 20;

}



// Signal strength levels, primarily used by android/telephony/SignalStrength.java.

telephony/java/android/telephony/RadioAccessFamily.java

+3 −0
Original line number Diff line number Diff line
@@ -460,6 +460,9 @@ public class RadioAccessFamily implements Parcelable { 
        if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA)) != 0) {

            networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;

        }

        if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_NR)) != 0) {

            networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_NR;

        }



        return (networkTypeRaf == 0) ? TelephonyManager.NETWORK_TYPE_UNKNOWN : networkTypeRaf;

    }

telephony/java/android/telephony/ServiceState.java

+8 −2
Original line number Diff line number Diff line
@@ -223,9 +223,15 @@ public class ServiceState implements Parcelable { 
    public static final int RIL_RADIO_TECHNOLOGY_LTE_CA = 19;



    /**

     * Number of radio technologies for GSM, UMTS and CDMA.

     * NR(New Radio) 5G.

     * @hide

     */

    public static final int  RIL_RADIO_TECHNOLOGY_NR = 20;



    /**

     * The number of the radio technologies.

     */

    private static final int NEXT_RIL_RADIO_TECHNOLOGY = 20;

    private static final int NEXT_RIL_RADIO_TECHNOLOGY = 21;



    /** @hide */

    public static final int RIL_RADIO_CDMA_TECHNOLOGY_BITMASK =