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

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -40313,7 +40313,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
		@@ -43756,8 +43756,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);
		@@ -43767,7 +43767,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();
		@@ -43842,7 +43842,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();
		@@ -43867,7 +43867,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

+1 −1

Original line number	Diff line number	Diff line
		@@ -40573,7 +40573,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();

telephony/java/android/telephony/TelephonyManager.java

+24 −4

Original line number	Diff line number	Diff line
		@@ -5159,7 +5159,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) {
		@@ -5172,7 +5177,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() {
		@@ -5186,7 +5195,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() {
		@@ -5199,7 +5212,11 @@ public class TelephonyManager {
		}
		}

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

		/**
		* @deprecated Use {@link android.telecom.TelecomManager#silenceRinger} 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();