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

Commit fb4e23d9 authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

Merge "Always allow unmetered APNs when romaing" am: 6546a6f9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1340454

Change-Id: I3ef6b2621705a521341b82b0635e59450a876ec1
parents 81ecc696 6546a6f9

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

+16 −1
Original line number Diff line number Diff line
@@ -711,11 +711,26 @@ public class DataConnection extends StateMachine { 
        // old modem backward compatibility).

        boolean isModemRoaming = mPhone.getServiceState().getDataRoamingFromRegistration();



        // If the apn is NOT metered, we will allow data roaming regardless of the setting.

        boolean isUnmeteredApnType = !ApnSettingUtils.isMeteredApnType(

                cp.mApnContext.getApnTypeBitmask(), mPhone);



        // Set this flag to true if the user turns on data roaming. Or if we override the roaming

        // state in framework, we should set this flag to true as well so the modem will not reject

        // the data call setup (because the modem actually thinks the device is roaming).

        boolean allowRoaming = mPhone.getDataRoamingEnabled()

                || (isModemRoaming && !mPhone.getServiceState().getDataRoaming());

                || (isModemRoaming && (!mPhone.getServiceState().getDataRoaming()

                || isUnmeteredApnType));



        if (DBG) {

            log("allowRoaming=" + allowRoaming

                    + ", mPhone.getDataRoamingEnabled()=" + mPhone.getDataRoamingEnabled()

                    + ", isModemRoaming=" + isModemRoaming

                    + ", mPhone.getServiceState().getDataRoaming()="

                    + mPhone.getServiceState().getDataRoaming()

                    + ", isUnmeteredApnType=" + isUnmeteredApnType

            );

        }



        // Check if this data setup is a handover.

        LinkProperties linkProperties = null;