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

Commit 5f71620a authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Remove LTE_CA HAL usages"

parents 2fc9baa3 d7beaac3

Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -83,14 +83,14 @@ java_library { 
        "android.hardware.radio-V1.4-java",

        "android.hardware.radio-V1.5-java",

        "android.hardware.radio-V1.6-java",

        "android.hardware.radio.config-V1-java",

        "android.hardware.radio.data-V1-java",

        "android.hardware.radio.config-V2-java",

        "android.hardware.radio.data-V2-java",

        "android.hardware.radio.ims-V1-java",

        "android.hardware.radio.messaging-V1-java",

        "android.hardware.radio.modem-V1-java",

        "android.hardware.radio.messaging-V2-java",

        "android.hardware.radio.modem-V2-java",

        "android.hardware.radio.network-V2-java",

        "android.hardware.radio.sim-V1-java",

        "android.hardware.radio.voice-V1-java",

        "android.hardware.radio.sim-V2-java",

        "android.hardware.radio.voice-V2-java",

        "voip-common",

        "ims-common",

        "unsupportedappusage",

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

+2 −4
Original line number Diff line number Diff line
@@ -1681,12 +1681,10 @@ public class RILUtils { 
        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN) != 0) {

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

        }

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

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_LTE) != 0

                || (networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA) != 0) {

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

        }

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

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

        }

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

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

        }