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

Commit 5b2f4776 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Consider provisioning state when checking if data is enabled."

parents c6f85cbb 127e5c06

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

+10 −6
Original line number Diff line number Diff line
@@ -407,6 +407,9 @@ public class DataEnabledSettings { 
    }



    public synchronized boolean isDataEnabled(int apnType) {

        if (isProvisioning()) {

            return isProvisioningDataEnabled();

        } else {

            boolean userDataEnabled = isUserDataEnabled();

            // Check if we should temporarily enable data in certain conditions.

            boolean isDataEnabledOverridden = mDataEnabledOverride
@@ -415,6 +418,7 @@ public class DataEnabledSettings { 
            return (mInternalDataEnabled && mPolicyDataEnabled && mCarrierDataEnabled

                    && (userDataEnabled || isDataEnabledOverridden));

        }

    }



    private void log(String s) {

        Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "]" + s);