Merge "Consider provisioning state when checking if data is enabled." into qt-dev (e95807a1) · Commits · e / os / android_frameworks_opt_telephony

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -408,6 +408,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
		@@ -416,6 +419,7 @@ public class DataEnabledSettings {
		return (mInternalDataEnabled && mPolicyDataEnabled && mCarrierDataEnabled
		&& (userDataEnabled \|\| isDataEnabledOverridden));
		}
		}

		private void log(String s) {
		Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "]" + s);