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

Commit 6ee0e1bb authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

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

Merge "Consider provisioning state when checking if data is enabled." into qt-dev am: e95807a1 am: 53cc6ec5
am: abb949af

Change-Id: I1c1a1c7ec0ad89e451c9301004d1477f292ca0dc
parents 70860ea3 abb949af

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);