Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." (a9020549) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -39347,6 +39347,7 @@ package android.telecom {
		method public boolean isInManagedCall();
		method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isTtySupported();
		method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
		method public void placeCall(android.net.Uri, android.os.Bundle);
		method public void registerPhoneAccount(android.telecom.PhoneAccount);
		@@ -40135,7 +40136,7 @@ package android.telephony {
		method public boolean isHearingAidCompatibilitySupported();
		method public boolean isNetworkRoaming();
		method public boolean isSmsCapable();
		method public boolean isTtyModeSupported();
		method public deprecated boolean isTtyModeSupported();
		method public boolean isVoiceCapable();
		method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
		method public boolean isWorldPhone();

api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -43531,8 +43531,8 @@ package android.telephony {
		}

		public class TelephonyManager {
		method public void answerRingingCall();
		method public void call(java.lang.String, java.lang.String);
		method public deprecated void answerRingingCall();
		method public deprecated void call(java.lang.String, java.lang.String);
		method public boolean canChangeDtmfToneLength();
		method public int checkCarrierPrivilegesForPackage(java.lang.String);
		method public int checkCarrierPrivilegesForPackageAnyPhone(java.lang.String);
		@@ -43542,7 +43542,7 @@ package android.telephony {
		method public boolean disableDataConnectivity();
		method public boolean enableDataConnectivity();
		method public void enableVideoCalling(boolean);
		method public boolean endCall();
		method public deprecated boolean endCall();
		method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
		method public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);
		method public int getCallState();
		@@ -43617,7 +43617,7 @@ package android.telephony {
		method public boolean isRadioOn();
		method public boolean isRinging();
		method public boolean isSmsCapable();
		method public boolean isTtyModeSupported();
		method public deprecated boolean isTtyModeSupported();
		method public boolean isVideoCallingEnabled();
		method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
		method public boolean isVoiceCapable();
		@@ -43642,7 +43642,7 @@ package android.telephony {
		method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
		method public void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);
		method public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean);
		method public void silenceRinger();
		method public deprecated void silenceRinger();
		method public boolean supplyPin(java.lang.String);
		method public int[] supplyPinReportResult(java.lang.String);
		method public boolean supplyPuk(java.lang.String, java.lang.String);

api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -39569,6 +39569,7 @@ package android.telecom {
		method public boolean isInManagedCall();
		method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
		method public boolean isTtySupported();
		method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
		method public void placeCall(android.net.Uri, android.os.Bundle);
		method public void registerPhoneAccount(android.telecom.PhoneAccount);
		@@ -40357,7 +40358,7 @@ package android.telephony {
		method public boolean isHearingAidCompatibilitySupported();
		method public boolean isNetworkRoaming();
		method public boolean isSmsCapable();
		method public boolean isTtyModeSupported();
		method public deprecated boolean isTtyModeSupported();
		method public boolean isVoiceCapable();
		method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
		method public boolean isWorldPhone();

telecomm/java/android/telecom/TelecomManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -1307,10 +1307,7 @@ public class TelecomManager {

		/**
		* Returns whether TTY is supported on this device.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(anyOf = {
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
		android.Manifest.permission.READ_PHONE_STATE

telephony/java/android/telephony/TelephonyManager.java

+24 −4

Original line number	Diff line number	Diff line
		@@ -5086,7 +5086,12 @@ public class TelephonyManager {
		}
		}

		/** @hide */
		/**
		* @deprecated Use {@link android.telecom.TelecomManager#placeCall(Uri address,
		* Bundle extras)} instead.
		* @hide
		*/
		@Deprecated
		@SystemApi
		@RequiresPermission(android.Manifest.permission.CALL_PHONE)
		public void call(String callingPackage, String number) {
		@@ -5099,7 +5104,11 @@ public class TelephonyManager {
		}
		}

		/** @hide */
		/**
		* @deprecated Use {@link android.telecom.TelecomManager#endCall()} instead.
		* @hide
		*/
		@Deprecated
		@SystemApi
		@RequiresPermission(android.Manifest.permission.CALL_PHONE)
		public boolean endCall() {
		@@ -5113,7 +5122,11 @@ public class TelephonyManager {
		return false;
		}

		/** @hide */
		/**
		* @deprecated Use {@link android.telecom.TelecomManager#acceptRingingCall} instead
		* @hide
		*/
		@Deprecated
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void answerRingingCall() {
		@@ -5126,7 +5139,11 @@ public class TelephonyManager {
		}
		}

		/** @hide */
		/**
		* @deprecated Use {@link android.telecom.TelecomManager#silenceRinger} instead
		* @hide
		*/
		@Deprecated
		@SystemApi
		@SuppressLint("Doclava125")
		public void silenceRinger() {
		@@ -5681,10 +5698,13 @@ public class TelephonyManager {
		}

		/**
		* @deprecated Use {link@ android.telecom.TelecomManager#isTtySupported} instead
		* Whether the phone supports TTY mode.
		*
		* @return {@code true} if the device supports TTY mode, and {@code false} otherwise.
		*
		*/
		@Deprecated
		public boolean isTtyModeSupported() {
		try {
		ITelephony telephony = getITelephony();