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

Commit 1bdc1177 authored by Rafael Higuera Silva's avatar Rafael Higuera Silva Committed by Chi Zhang
Browse files

Add NR bands to service state. 

Bug: 231523547
Test: make
Change-Id: I2b2fb7b4728d9bd4af981fe853eaa69a6b51d33e
(cherry picked from commit 83050a70)
parent ef78f4d0

telephony/java/android/telephony/AccessNetworkUtils.java

+103 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ import static android.telephony.ServiceState.DUPLEX_MODE_FDD; 
import static android.telephony.ServiceState.DUPLEX_MODE_TDD;

import static android.telephony.ServiceState.DUPLEX_MODE_UNKNOWN;



import android.telephony.AccessNetworkConstants.EutranBandArfcnFrequency;

import android.telephony.AccessNetworkConstants.EutranBand;

import android.telephony.AccessNetworkConstants.EutranBandArfcnFrequency;

import android.telephony.AccessNetworkConstants.GeranBand;

import android.telephony.AccessNetworkConstants.GeranBandArfcnFrequency;

import android.telephony.AccessNetworkConstants.NgranArfcnFrequency;
@@ -13,7 +13,6 @@ import android.telephony.AccessNetworkConstants.NgranBands; 
import android.telephony.AccessNetworkConstants.UtranBand;

import android.telephony.AccessNetworkConstants.UtranBandArfcnFrequency;

import android.telephony.ServiceState.DuplexMode;

import android.util.Log;



import java.util.Arrays;

import java.util.HashSet;
@@ -231,6 +230,108 @@ public class AccessNetworkUtils { 
        return INVALID_BAND;

    }



    /**

     * Gets the NR Operating band for a given downlink NRARFCN.

     *

     * <p>See 3GPP TS 38.104 Table 5.2-1 NR operating bands in FR1 and

     * Table 5.2-2 NR operating bands in FR2

     *

     * @param nrarfcn The downlink NRARFCN

     * @return Operating band number, or {@link #INVALID_BAND} if no corresponding band exists

     */

    public static int getOperatingBandForNrarfcn(int nrarfcn) {

        if (nrarfcn >= 422000 && nrarfcn <= 434000) {

            return NgranBands.BAND_1;

        } else if (nrarfcn >= 386000 && nrarfcn <= 398000) {

            return NgranBands.BAND_2;

        } else if (nrarfcn >= 361000 && nrarfcn <= 376000) {

            return NgranBands.BAND_3;

        } else if (nrarfcn >= 173800 && nrarfcn <= 178800) {

            return NgranBands.BAND_5;

        } else if (nrarfcn >= 524000 && nrarfcn <= 538000) {

            return NgranBands.BAND_7;

        } else if (nrarfcn >= 185000 && nrarfcn <= 192000) {

            return NgranBands.BAND_8;

        } else if (nrarfcn >= 145800 && nrarfcn <= 149200) {

            return NgranBands.BAND_12;

        } else if (nrarfcn >= 151600 && nrarfcn <= 153600) {

            return NgranBands.BAND_14;

        } else if (nrarfcn >= 172000 && nrarfcn <= 175000) {

            return NgranBands.BAND_18;

        } else if (nrarfcn >= 158200 && nrarfcn <= 164200) {

            return NgranBands.BAND_20;

        } else if (nrarfcn >= 386000 && nrarfcn <= 399000) {

            return NgranBands.BAND_25;

        } else if (nrarfcn >= 171800 && nrarfcn <= 178800) {

            return NgranBands.BAND_26;

        } else if (nrarfcn >= 151600 && nrarfcn <= 160600) {

            return NgranBands.BAND_28;

        } else if (nrarfcn >= 143400 && nrarfcn <= 145600) {

            return NgranBands.BAND_29;

        } else if (nrarfcn >= 470000 && nrarfcn <= 472000) {

            return NgranBands.BAND_30;

        } else if (nrarfcn >= 402000 && nrarfcn <= 405000) {

            return NgranBands.BAND_34;

        } else if (nrarfcn >= 514000 && nrarfcn <= 524000) {

            return NgranBands.BAND_38;

        } else if (nrarfcn >= 376000 && nrarfcn <= 384000) {

            return NgranBands.BAND_39;

        } else if (nrarfcn >= 460000 && nrarfcn <= 480000) {

            return NgranBands.BAND_40;

        } else if (nrarfcn >= 499200 && nrarfcn <= 537999) {

            return NgranBands.BAND_41;

        } else if (nrarfcn >= 743334 && nrarfcn <= 795000) {

            return NgranBands.BAND_46;

        } else if (nrarfcn >= 636667 && nrarfcn <= 646666) {

            return NgranBands.BAND_48;

        } else if (nrarfcn >= 286400 && nrarfcn <= 303400) {

            return NgranBands.BAND_50;

        } else if (nrarfcn >= 285400 && nrarfcn <= 286400) {

            return NgranBands.BAND_51;

        } else if (nrarfcn >= 496700 && nrarfcn <= 499000) {

            return NgranBands.BAND_53;

        } else if (nrarfcn >= 422000 && nrarfcn <= 440000) {

            return NgranBands.BAND_65; // BAND_66 has the same channels

        } else if (nrarfcn >= 399000 && nrarfcn <= 404000) {

            return NgranBands.BAND_70;

        } else if (nrarfcn >= 123400 && nrarfcn <= 130400) {

            return NgranBands.BAND_71;

        } else if (nrarfcn >= 295000 && nrarfcn <= 303600) {

            return NgranBands.BAND_74;

        } else if (nrarfcn >= 286400 && nrarfcn <= 303400) {

            return NgranBands.BAND_75;

        } else if (nrarfcn >= 285400 && nrarfcn <= 286400) {

            return NgranBands.BAND_76;

        } else if (nrarfcn >= 620000 && nrarfcn <= 680000) {

            return NgranBands.BAND_77;

        } else if (nrarfcn >= 620000 && nrarfcn <= 653333) {

            return NgranBands.BAND_78;

        } else if (nrarfcn >= 693334 && nrarfcn <= 733333) {

            return NgranBands.BAND_79;

        } else if (nrarfcn >= 499200 && nrarfcn <= 538000) {

            return NgranBands.BAND_90;

        } else if (nrarfcn >= 285400 && nrarfcn <= 286400) {

            return NgranBands.BAND_91;

        } else if (nrarfcn >= 286400 && nrarfcn <= 303400) {

            return NgranBands.BAND_92;

        } else if (nrarfcn >= 285400 && nrarfcn <= 286400) {

            return NgranBands.BAND_93;

        } else if (nrarfcn >= 286400 && nrarfcn <= 303400) {

            return NgranBands.BAND_94;

        } else if (nrarfcn >= 795000 && nrarfcn <= 875000) {

            return NgranBands.BAND_96;

        } else if (nrarfcn >= 2054166 && nrarfcn <= 2104165) {

            return NgranBands.BAND_257;

        } else if (nrarfcn >= 2016667 && nrarfcn <= 2070832) {

            return NgranBands.BAND_258;

        } else if (nrarfcn >= 2229166 && nrarfcn <= 2279165) {

            return NgranBands.BAND_260;

        } else if (nrarfcn >= 2070833 && nrarfcn <= 2084999) {

            return NgranBands.BAND_261;

        }

        return INVALID_BAND;

    }



    /**

     * Gets the GERAN Operating band for a given ARFCN.

     *