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

Commit 41077bfe authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Fix isUnmeteredUseOnly check. 

When returning false because data is enabled, roaming state should
be checked as well.

Test: atest DataConnectionTest
Bug: 152718337
Change-Id: I92ae1a55dff050bc21d7d101f90fe6f4afe7ea9e
parent e3801157

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

+6 −8
Original line number Diff line number Diff line
@@ -1277,15 +1277,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