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

Commit 1e5cf652 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Core refactor" into rvc-dev

parents 6c599955 b1c7e210
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.settings.network.telephony;


import android.telephony.TelephonyManager;

/**
@@ -210,6 +209,12 @@ public class TelephonyConstants {
     * Copied from {@link android.telephony.RadioAccessFamily}
     */
    public static class RadioAccessFamily {
        /**
         * TODO: get rid of RAF definition in RadioAccessFamily and
         * use {@link TelephonyManager.NetworkTypeBitMask}
         * TODO: public definition {@link TelephonyManager.NetworkTypeBitMask} is long.
         * TODO: Convert from int * to long everywhere including HAL definitions.
         */
        // 2G
        public static final int RAF_UNKNOWN = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
        public static final int RAF_GSM = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
@@ -245,9 +250,7 @@ public class TelephonyConstants {
        public static final int WCDMA = HS | RAF_UMTS;
        // 4G
        public static final int LTE = RAF_LTE | RAF_LTE_CA;

        // 5G
        public static final int NR = RAF_NR;

    }
}