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

Commit 230b270f authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add NB_IOT_NTN"" into main

parents e75979a5 f7679613

src/java/com/android/internal/telephony/RILUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -1698,9 +1698,6 @@ public class RILUtils { 
        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NR) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.NR;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NB_IOT_NTN) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.NB_IOT_NTN;

        }

        return (raf == 0) ? android.hardware.radio.RadioAccessFamily.UNKNOWN : raf;

    }

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ public class ServiceStateTest extends TestCase { 
        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_NR, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_NB_IOT_NTN, false));



        for (Pair<Integer, Boolean> rat : rats) {

            boolean isCdma = rat.second;