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

Commit e07c3af7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix isUnmeteredUseOnly check." into rvc-dev am: 9aa88106 

Change-Id: I6a3f1374496706c4769b783f67cad1e1618222d5
parents 674116f6 9aa88106

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

+6 −8
Original line number Diff line number Diff line
@@ -1296,15 +1296,13 @@ public class DataConnection extends StateMachine { 
        }



        // If data is enabled, this data connection can't be for unmetered used only because

        // everyone should be able to use it.

        // everyone should be able to use it if:

        // 1. Device is not roaming, or

        // 2. Device is roaming and data roaming is turned on

        if (mPhone.getDataEnabledSettings().isDataEnabled()) {

            if (!mPhone.getServiceState().getDataRoaming() || mDct.getDataRoamingEnabled()) {

                return false;

            }



        // If the device is roaming and data roaming it turned on, then this data connection can't

        // be for unmetered use only.

        if (mDct.getDataRoamingEnabled() && mPhone.getServiceState().getDataRoaming()) {

            return false;

        }



        // The data connection can only be unmetered used only if all attached APN contexts