Add isMobileDataEnabled in TelephonyManager. (ffbaa9de) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −2

api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4039,7 +4039,7 @@ package android.telephony {
	method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);		method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
	method public boolean needsOtaServiceProvisioning();		method public boolean needsOtaServiceProvisioning();
	method public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);		method public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
	method public void setDataEnabled(int, boolean);		method public deprecated void setDataEnabled(int, boolean);
	method public boolean setRadio(boolean);		method public boolean setRadio(boolean);
	method public boolean setRadioPower(boolean);		method public boolean setRadioPower(boolean);
	method public deprecated void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);		method public deprecated void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);

core/java/android/net/ConnectivityManager.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1794,7 +1794,7 @@ public class ConnectivityManager {
	ITelephony it = ITelephony.Stub.asInterface(b);		ITelephony it = ITelephony.Stub.asInterface(b);
	int subId = SubscriptionManager.getDefaultDataSubscriptionId();		int subId = SubscriptionManager.getDefaultDataSubscriptionId();
	Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);		Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);
	boolean retVal = it.getDataEnabled(subId);		boolean retVal = it.isUserDataEnabled(subId);
	Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId		Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId
	+ " retVal=" + retVal);		+ " retVal=" + retVal);
	return retVal;		return retVal;

telephony/java/android/telephony/TelephonyManager.java

+116 −27

Original line number	Original line	Diff line number	Diff line
	@@ -5676,39 +5676,38 @@ public class TelephonyManager {
	* @param enable Whether to enable mobile data.		* @param enable Whether to enable mobile data.
	*		*
	* @see #hasCarrierPrivileges		* @see #hasCarrierPrivileges
			* @deprecated use {@link #setUserMobileDataEnabled(boolean)} instead.
	*/		*/
			@Deprecated
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public void setDataEnabled(boolean enable) {		public void setDataEnabled(boolean enable) {
	setDataEnabled(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()), enable);		setUserMobileDataEnabled(enable);
	}		}

	/** @hide */		/**
			* @hide
			* @deprecated use {@link #setUserMobileDataEnabled(boolean)} instead.
			*/
	@SystemApi		@SystemApi
			@Deprecated
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public void setDataEnabled(int subId, boolean enable) {		public void setDataEnabled(int subId, boolean enable) {
	try {		setUserMobileDataEnabled(subId, enable);
	Log.d(TAG, "setDataEnabled: enabled=" + enable);
	ITelephony telephony = getITelephony();
	if (telephony != null)
	telephony.setDataEnabled(subId, enable);
	} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelephony#setDataEnabled", e);
	}
	}		}


	/**		/**
	* @deprecated use {@link #isDataEnabled()} instead.		* @deprecated use {@link #isUserMobileDataEnabled()} instead.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@Deprecated		@Deprecated
	public boolean getDataEnabled() {		public boolean getDataEnabled() {
	return isDataEnabled();		return isUserMobileDataEnabled();
	}		}

	/**		/**
	* Returns whether mobile data is enabled or not.		* Returns whether mobile data is enabled or not per user setting. There are other factors
			* that could disable mobile data, but they are not considered here.
	*		*
	* If this object has been created with {@link #createForSubscriptionId}, applies to the given		* If this object has been created with {@link #createForSubscriptionId}, applies to the given
	* subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}		* subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
	@@ -5725,28 +5724,21 @@ public class TelephonyManager {
	* @return true if mobile data is enabled.		* @return true if mobile data is enabled.
	*		*
	* @see #hasCarrierPrivileges		* @see #hasCarrierPrivileges
			* @deprecated use {@link #isUserMobileDataEnabled()} instead.
	*/		*/
	@SuppressWarnings("deprecation")		@Deprecated
	public boolean isDataEnabled() {		public boolean isDataEnabled() {
	return getDataEnabled(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));		return isUserMobileDataEnabled();
	}		}

	/**		/**
	* @deprecated use {@link #isDataEnabled(int)} instead.		* @deprecated use {@link #isUserMobileDataEnabled()} instead.
	* @hide		* @hide
	*/		*/
			@Deprecated
	@SystemApi		@SystemApi
	public boolean getDataEnabled(int subId) {		public boolean getDataEnabled(int subId) {
	boolean retVal = false;		return isUserMobileDataEnabled(subId);
	try {
	ITelephony telephony = getITelephony();
	if (telephony != null)
	retVal = telephony.getDataEnabled(subId);
	} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelephony#getDataEnabled", e);
	} catch (NullPointerException e) {
	}
	return retVal;
	}		}

	/** @hide */		/** @hide */
	@@ -6898,4 +6890,101 @@ public class TelephonyManager {
	}		}
	return null;		return null;
	}		}

			/**
			* Turns mobile data on or off.
			* If the {@link TelephonyManager} object has been created with
			* {@link #createForSubscriptionId}, this API applies to the given subId.
			* Otherwise, it applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
			*
			* <p>Requires Permission:
			* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the
			* calling app has carrier privileges.
			*
			* @param enable Whether to enable mobile data.
			*
			* @see #hasCarrierPrivileges
			*/
			@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			public void setUserMobileDataEnabled(boolean enable) {
			setUserMobileDataEnabled(
			getSubId(SubscriptionManager.getDefaultDataSubscriptionId()), enable);
			}

			/**
			* Returns whether mobile data is enabled or not per user setting. There are other factors
			* that could disable mobile data, but they are not considered here.
			*
			* If this object has been created with {@link #createForSubscriptionId}, applies to the given
			* subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
			*
			* <p>Requires one of the following permissions:
			* {@link android.Manifest.permission#ACCESS_NETWORK_STATE ACCESS_NETWORK_STATE},
			* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}, or that the
			* calling app has carrier privileges.
			*
			* <p>Note that this does not take into account any data restrictions that may be present on the
			* calling app. Such restrictions may be inspected with
			* {@link ConnectivityManager#getRestrictBackgroundStatus}.
			*
			* @return true if mobile data is enabled.
			*
			* @see #hasCarrierPrivileges
			*/
			@RequiresPermission(anyOf = {
			android.Manifest.permission.ACCESS_NETWORK_STATE,
			android.Manifest.permission.MODIFY_PHONE_STATE
			})
			public boolean isUserMobileDataEnabled() {
			return isUserMobileDataEnabled(
			getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
			}

			/**
			* @hide
			* Unlike isUserMobileDataEnabled, this API also evaluates carrierDataEnabled,
			* policyDataEnabled etc to give a final decision.
			*/
			public boolean isMobileDataEnabled() {
			boolean retVal = false;
			try {
			int subId = getSubId(SubscriptionManager.getDefaultDataSubscriptionId());
			ITelephony telephony = getITelephony();
			if (telephony != null)
			retVal = telephony.isDataEnabled(subId);
			} catch (RemoteException e) {
			Log.e(TAG, "Error calling ITelephony#isDataEnabled", e);
			} catch (NullPointerException e) {
			}
			return retVal;
			}

			/**
			* Utility class of {@link #isUserMobileDataEnabled()};
			*/
			private boolean isUserMobileDataEnabled(int subId) {
			boolean retVal = false;
			try {
			ITelephony telephony = getITelephony();
			if (telephony != null)
			retVal = telephony.isUserDataEnabled(subId);
			} catch (RemoteException e) {
			Log.e(TAG, "Error calling ITelephony#isUserDataEnabled", e);
			} catch (NullPointerException e) {
			}
			return retVal;
			}

			/** Utility method of {@link #setUserMobileDataEnabled(boolean)} */
			@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			private void setUserMobileDataEnabled(int subId, boolean enable) {
			try {
			Log.d(TAG, "setUserMobileDataEnabled: enabled=" + enable);
			ITelephony telephony = getITelephony();
			if (telephony != null)
			telephony.setUserDataEnabled(subId, enable);
			} catch (RemoteException e) {
			Log.e(TAG, "Error calling ITelephony#setUserDataEnabled", e);
			}
			}
	}		}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -870,15 +870,34 @@ interface ITelephony {
	*		*
	* @param enable true to turn on, else false		* @param enable true to turn on, else false
	*/		*/
	void setDataEnabled(int subId, boolean enable);		void setUserDataEnabled(int subId, boolean enable);

	/**		/**
	* Get the user enabled state of Mobile Data.		* Get the user enabled state of Mobile Data.
	*		*
			* TODO: remove and use isUserDataEnabled.
			* This can't be removed now because some vendor codes
			* calls through ITelephony directly while they should
			* use TelephonyManager.
			*
	* @return true on enabled		* @return true on enabled
	*/		*/
	boolean getDataEnabled(int subId);		boolean getDataEnabled(int subId);

			/**
			* Get the user enabled state of Mobile Data.
			*
			* @return true on enabled
			*/
			boolean isUserDataEnabled(int subId);

			/**
			* Get the overall enabled state of Mobile Data.
			*
			* @return true on enabled
			*/
			boolean isDataEnabled(int subId);

	/**		/**
	* Get P-CSCF address from PCO after data connection is established or modified.		* Get P-CSCF address from PCO after data connection is established or modified.
	* @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN		* @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN