diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 10 | ||||
| -rw-r--r-- | api/test-current.txt | 3 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 28 |
5 files changed, 33 insertions, 14 deletions
diff --git a/api/current.txt b/api/current.txt index c4910d1e6b57..2c9d70571694 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39506,6 +39506,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); @@ -40295,7 +40296,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(); diff --git a/api/system-current.txt b/api/system-current.txt index 7718dbf9ff59..b4641f2a0fea 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -43735,8 +43735,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); @@ -43746,7 +43746,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(); @@ -43821,7 +43821,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(); @@ -43846,7 +43846,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); diff --git a/api/test-current.txt b/api/test-current.txt index a0453d6c219c..1a0073a65040 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -39777,6 +39777,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); @@ -40566,7 +40567,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(); diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index b1eedf5cad4b..aa2323d29ec2 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1345,10 +1345,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 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ed2234edb775..d90a7fb11f48 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5160,7 +5160,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) { @@ -5173,7 +5178,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() { @@ -5187,7 +5196,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() { @@ -5200,7 +5213,11 @@ public class TelephonyManager { } } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#silenceRinger} instead + * @hide + */ + @Deprecated @SystemApi @SuppressLint("Doclava125") public void silenceRinger() { @@ -5755,10 +5772,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(); |