Merge "Rename isDataEnabled and getDataEnabled in DcTracker." (7f02f4a2) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

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

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

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

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

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

+9 −4

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

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

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

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

	/**		/**

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -747,12 +747,17 @@ public interface PhoneInternalInterface {
	/**		/**
	* @return true if user has enabled data		* @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		* @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.		* Retrieves the unique device ID, e.g., IMEI for GSM phones and MEID for CDMA phones.

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

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -793,7 +793,7 @@ public class DcTracker extends Handler {
	/**		/**
	* Modify {@link android.provider.Settings.Global#MOBILE_DATA} value.		* 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);		Message msg = obtainMessage(DctConstants.CMD_SET_USER_DATA_ENABLE);
	msg.arg1 = enable ? 1 : 0;		msg.arg1 = enable ? 1 : 0;
	if (DBG) log("setDataEnabled: sendMessage: enable=" + enable);		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		@VisibleForTesting
	public boolean isDataEnabled() {		public boolean isDataEnabled() {
	return mDataEnabledSettings.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()) {		if (mDataEnabledSettings.isProvisioning()) {
	return mDataEnabledSettings.isProvisioningDataEnabled();		return mDataEnabledSettings.isProvisioningDataEnabled();
	} else {		} else {

src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java

+7 −2

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

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

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

			@Override
			public void setUserDataEnabled(boolean enable) {
	}		}