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

Commit 66a14232 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine TelephonyManager#getBitMaskForNetworkType"

parents 5100971d e008e7e9

core/api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -44006,9 +44006,10 @@ package android.telephony { 
    field public static final long NETWORK_TYPE_BITMASK_HSPA = 512L; // 0x200L

    field public static final long NETWORK_TYPE_BITMASK_HSPAP = 16384L; // 0x4000L

    field public static final long NETWORK_TYPE_BITMASK_HSUPA = 256L; // 0x100L

    field public static final long NETWORK_TYPE_BITMASK_IDEN = 1024L; // 0x400L

    field public static final long NETWORK_TYPE_BITMASK_IWLAN = 131072L; // 0x20000L

    field public static final long NETWORK_TYPE_BITMASK_LTE = 4096L; // 0x1000L

    field public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L

    field @Deprecated public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L

    field public static final long NETWORK_TYPE_BITMASK_NR = 524288L; // 0x80000L

    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L

    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L

telephony/java/android/telephony/TelephonyManager.java

+11 −6
Original line number Diff line number Diff line
@@ -3323,15 +3323,14 @@ public class TelephonyManager { 
            case NETWORK_TYPE_TD_SCDMA:

                return NETWORK_TYPE_BITMASK_TD_SCDMA;

            case NETWORK_TYPE_LTE:

                return NETWORK_TYPE_BITMASK_LTE;

            case NETWORK_TYPE_LTE_CA:

                return NETWORK_TYPE_BITMASK_LTE_CA;

                return NETWORK_TYPE_BITMASK_LTE;

            case NETWORK_TYPE_NR:

                return NETWORK_TYPE_BITMASK_NR;

            case NETWORK_TYPE_IWLAN:

                return NETWORK_TYPE_BITMASK_IWLAN;

            case NETWORK_TYPE_IDEN:

                return (1 << (NETWORK_TYPE_IDEN - 1));

                return NETWORK_TYPE_BITMASK_IDEN;

            default:

                return NETWORK_TYPE_BITMASK_UNKNOWN;

        }
@@ -13911,7 +13910,8 @@ public class TelephonyManager { 
                    NETWORK_TYPE_BITMASK_LTE,

                    NETWORK_TYPE_BITMASK_LTE_CA,

                    NETWORK_TYPE_BITMASK_NR,

                    NETWORK_TYPE_BITMASK_IWLAN

                    NETWORK_TYPE_BITMASK_IWLAN,

                    NETWORK_TYPE_BITMASK_IDEN

            })

    public @interface NetworkTypeBitMask {}










@@ -13970,6 +13970,10 @@ public class TelephonyManager {













     * network type bitmask indicating the support of radio tech HSPA.















     */















    public static final long NETWORK_TYPE_BITMASK_HSPA = (1 << (NETWORK_TYPE_HSPA -1));













    /**













     * network type bitmask indicating the support of radio tech iDen.













     */













    public static final long NETWORK_TYPE_BITMASK_IDEN = (1 << (NETWORK_TYPE_IDEN - 1));















    /**















     * network type bitmask indicating the support of radio tech HSPAP.















     */









@@ -13988,12 +13992,13 @@ public class TelephonyManager {













     */















    public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1));















    /**













     * NOT USED; this bitmask is exposed accidentally, will be deprecated in U.













     * NOT USED; this bitmask is exposed accidentally.















     * If used, will be converted to {@link #NETWORK_TYPE_BITMASK_LTE}.















     * network type bitmask indicating the support of radio tech LTE CA (carrier aggregation).















     *













     * @see #NETWORK_TYPE_BITMASK_LTE













     * @deprecated Please use {@link #NETWORK_TYPE_BITMASK_LTE} instead.















     */













    @Deprecated















    public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1));





























    /**