Merge "Add methods for device telephony configs." (2b84e98e) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29331,6 +29331,7 @@ package android.telephony {
	}		}

	public class TelephonyManager {		public class TelephonyManager {
			method public boolean canChangeDtmfToneLength();
	method public java.util.List<android.telephony.CellInfo> getAllCellInfo();		method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
	method public int getCallState();		method public int getCallState();
	method public android.telephony.CellLocation getCellLocation();		method public android.telephony.CellLocation getCellLocation();
	@@ -29366,6 +29367,7 @@ package android.telephony {
	method public boolean isNetworkRoaming();		method public boolean isNetworkRoaming();
	method public boolean isSmsCapable();		method public boolean isSmsCapable();
	method public boolean isVoiceCapable();		method public boolean isVoiceCapable();
			method public boolean isWorldPhone();
	method public void listen(android.telephony.PhoneStateListener, int);		method public void listen(android.telephony.PhoneStateListener, int);
	method public java.lang.String sendEnvelopeWithStatus(java.lang.String);		method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
	method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);		method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);

+2 −0

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3715,6 +3715,34 @@ public class TelephonyManager {
	return false;		return false;
	}		}

			/**
			* Whether the device supports configuring the DTMF tone length.
			*
			* @return {@code true} if the DTMF tone length can be changed, and {@code false} otherwise.
			*/
			public boolean canChangeDtmfToneLength() {
			try {
			return getITelephony().canChangeDtmfToneLength();
			} catch (RemoteException e) {
			Log.e(TAG, "Error calling ITelephony#canChangeDtmfToneLength", e);
			}
			return false;
			}

			/**
			* Whether the device is a world phone.
			*
			* @return {@code true} if the device is a world phone, and {@code false} otherwise.
			*/
			public boolean isWorldPhone() {
			try {
			return getITelephony().isWorldPhone();
			} catch (RemoteException e) {
			Log.e(TAG, "Error calling ITelephony#isWorldPhone", e);
			}
			return false;
			}

	/**		/**
	* This function retrieves value for setting "name+subId", and if that is not found		* This function retrieves value for setting "name+subId", and if that is not found
	* retrieves value for setting "name", and if that is not found uses def as default		* retrieves value for setting "name", and if that is not found uses def as default

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -863,10 +863,24 @@ interface ITelephony {
	/**		/**
	* Whether video calling has been enabled by the user.		* Whether video calling has been enabled by the user.
	*		*
	* @return {@code True} if the user has enabled video calling, {@code false} otherwise.		* @return {@code true} if the user has enabled video calling, {@code false} otherwise.
	*/		*/
	boolean isVideoCallingEnabled();		boolean isVideoCallingEnabled();

			/**
			* Whether the DTMF tone length can be changed.
			*
			* @return {@code true} if the DTMF tone length can be changed.
			*/
			boolean canChangeDtmfToneLength();

			/**
			* Whether the device is a world phone.
			*
			* @return {@code true} if the devices is a world phone.
			*/
			boolean isWorldPhone();

	/**		/**
	* Get IMS Registration Status		* Get IMS Registration Status
	*/		*/