Merge "Rename isDataEnabled and getDataEnabled in DcTracker." am: 7f02f4a21f (eb882237) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CarrierActionAgent.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.IndentingPrintWriter;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		@@ -147,7 +148,7 @@ public class CarrierActionAgent extends Handler {
		break;
		case EVENT_MOBILE_DATA_SETTINGS_CHANGED:
		log("EVENT_MOBILE_DATA_SETTINGS_CHANGED");
		if (!mPhone.getDataEnabled()) carrierActionReset();
		if (!mPhone.isUserDataEnabled()) carrierActionReset();
		break;
		case EVENT_DATA_ROAMING_OFF:
		log("EVENT_DATA_ROAMING_OFF");

+9 −4

Original line number	Diff line number	Diff line
		@@ -1982,13 +1982,18 @@ public class GsmCdmaPhone extends Phone {
		}

		@Override
		public boolean getDataEnabled() {
		return mDcTracker.getDataEnabled();
		public boolean isUserDataEnabled() {
		return mDcTracker.isUserDataEnabled();
		}

		@Override
		public void setDataEnabled(boolean enable) {
		mDcTracker.setDataEnabled(enable);
		public boolean isDataEnabled() {
		return mDcTracker.isDataEnabled();
		}

		@Override
		public void setUserDataEnabled(boolean enable) {
		mDcTracker.setUserDataEnabled(enable);
		}

		/**

+7 −2

Original line number	Diff line number	Diff line
		@@ -747,12 +747,17 @@ public interface PhoneInternalInterface {
		/**
		* @return true if user has enabled data
		*/
		boolean getDataEnabled();
		boolean isUserDataEnabled();

		/**
		* @return true if data is enabled considering all factors
		*/
		boolean isDataEnabled();

		/**
		* @param @enable set {@code true} if enable data connection
		*/
		void setDataEnabled(boolean enable);
		void setUserDataEnabled(boolean enable);

		/**
		* Retrieves the unique device ID, e.g., IMEI for GSM phones and MEID for CDMA phones.

+9 −3

Original line number	Diff line number	Diff line
		@@ -793,7 +793,7 @@ public class DcTracker extends Handler {
		/**
		* Modify {@link android.provider.Settings.Global#MOBILE_DATA} value.
		*/
		public void setDataEnabled(boolean enable) {
		public void setUserDataEnabled(boolean enable) {
		Message msg = obtainMessage(DctConstants.CMD_SET_USER_DATA_ENABLE);
		msg.arg1 = enable ? 1 : 0;
		if (DBG) log("setDataEnabled: sendMessage: enable=" + enable);
		@@ -1177,6 +1177,10 @@ public class DcTracker extends Handler {
		}
		}

		/**
		* Whether data is enabled. This does not only check isUserDataEnabled(), but also
		* others like CarrierDataEnabled and internalDataEnabled.
		*/
		@VisibleForTesting
		public boolean isDataEnabled() {
		return mDataEnabledSettings.isDataEnabled();
		@@ -2574,9 +2578,11 @@ public class DcTracker extends Handler {
		}

		/**
		* Return current {@link android.provider.Settings.Global#MOBILE_DATA} value.
		* Whether data is enabled by user. Unlike isDataEnabled, this only
		* checks user setting stored in {@link android.provider.Settings.Global#MOBILE_DATA}
		* if not provisioning, or isProvisioningDataEnabled if provisioning.
		*/
		public boolean getDataEnabled() {
		public boolean isUserDataEnabled() {
		if (mDataEnabledSettings.isProvisioning()) {
		return mDataEnabledSettings.isProvisioningDataEnabled();
		} else {

+7 −2

Original line number	Diff line number	Diff line
		@@ -476,12 +476,17 @@ abstract class ImsPhoneBase extends Phone {
		}

		@Override
		public boolean getDataEnabled() {
		public boolean isUserDataEnabled() {
		return false;
		}

		@Override
		public void setDataEnabled(boolean enable) {
		public boolean isDataEnabled() {
		return false;
		}

		@Override
		public void setUserDataEnabled(boolean enable) {
		}