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

Commit e7559840 authored by Sukanya Rajkhowa's avatar Sukanya Rajkhowa Committed by Bruno Martins
Browse files

Support for radio technology NR 

- Add checks for radio tech NR
- Without the checks, phone switches from CDMA -> GSM will fail when
  RADIO_TECH is reported as NR

  CRs-Fixed: 2422797

Change-Id: I4412d12bca943aa6085231c6e224b0da1dc98e46
parent 4cf68453

telephony/java/android/telephony/ServiceState.java

+9 −1
Original line number Diff line number Diff line
@@ -1690,7 +1690,8 @@ public class ServiceState implements Parcelable { 
                || radioTechnology == RIL_RADIO_TECHNOLOGY_GSM

                || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA

                || radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN

                || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;

                || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA

                || radioTechnology == RIL_RADIO_TECHNOLOGY_NR;



    }
@@ -1712,6 +1713,13 @@ public class ServiceState implements Parcelable { 
                radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;

    }



    /** @hide */

    public static boolean isPsTech(int radioTechnology) {

        return radioTechnology == RIL_RADIO_TECHNOLOGY_LTE ||

                radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA ||

                radioTechnology == RIL_RADIO_TECHNOLOGY_NR;

    }



    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public static boolean bearerBitmapHasCdma(int networkTypeBitmask) {