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

Commit 58fff098 authored by Jack Yu's avatar Jack Yu Committed by Sarah Chin
Browse files

Exclude IWLAN from the checks 

We should only use the cellular data RAT to
check if the device is camped on 5G.

Also update the issue UUID so that we can disable the old
UUID from the server side.

Bug: 178674136
Test: Manual
Change-Id: Ic0e48ced3dc4f27244efeafc21604e89944c044d
Merged-In: Ic0e48ced3dc4f27244efeafc21604e89944c044d
parent 17bcd2ea

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

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

                .getTelephonyDisplayInfo();

        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

                || ((networkType == TelephonyManager.NETWORK_TYPE_LTE

                || networkType == TelephonyManager.NETWORK_TYPE_LTE_CA)
@@ -1744,11 +1747,11 @@ public class DataConnection extends StateMachine { 
                    + isTempNotMeteredSupportedByCarrier() + ", device 5G capable="

                    + isDevice5GCapable() + ", display info="

                    + mPhone.getDisplayInfoController().getTelephonyDisplayInfo()

                    + ", subscription plans=" + subscriptionManager.getSubscriptionPlans(mSubId);

                    + ", subscription plans=" + subscriptionManager.getSubscriptionPlans(mSubId)

                    + ", Service state=" + mPhone.getServiceState();

            loge(message);

            loge("Service state=" + mPhone.getServiceState());

            AnomalyReporter.reportAnomaly(

                    UUID.fromString("9151f0fc-01df-4afb-b744-9c4529055248"), message);

                    UUID.fromString("9151f0fc-01df-4afb-b744-9c4529055249"), message);

        }



        result.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED, !mIsSuspended);