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

Commit fd1c8f06 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Exclude IWLAN from the checks"

parents 3f4a3c61 99c7aa38

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -1659,7 +1659,10 @@ public class DataConnection extends StateMachine { 
        TelephonyDisplayInfo displayInfo = mPhone.getDisplayInfoController()

        TelephonyDisplayInfo displayInfo = mPhone.getDisplayInfoController()

                .getTelephonyDisplayInfo();

                .getTelephonyDisplayInfo();

        int overrideNetworkType = displayInfo.getOverrideNetworkType();

        int overrideNetworkType = displayInfo.getOverrideNetworkType();

        int networkType = mPhone.getServiceState().getDataNetworkType();

        NetworkRegistrationInfo nri =  mPhone.getServiceState().getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        int networkType = nri == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN

                : nri.getAccessNetworkTechnology();

        return networkType == TelephonyManager.NETWORK_TYPE_NR

        return networkType == TelephonyManager.NETWORK_TYPE_NR

                || ((networkType == TelephonyManager.NETWORK_TYPE_LTE

                || ((networkType == TelephonyManager.NETWORK_TYPE_LTE

                || networkType == TelephonyManager.NETWORK_TYPE_LTE_CA)

                || networkType == TelephonyManager.NETWORK_TYPE_LTE_CA)