diff --git a/api/current.txt b/api/current.txt index f776c82e7fc82..462d76e93de97 100755 --- a/api/current.txt +++ b/api/current.txt @@ -41861,12 +41861,12 @@ package android.telecom { public class TelecomManager { method public void acceptHandover(android.net.Uri, int, android.telecom.PhoneAccountHandle); - method @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(); - method @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int); + method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(); + method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int); method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void cancelMissedCallsNotification(); method public android.content.Intent createManageBlockedNumbersIntent(); - method @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall(); + method @Deprecated @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getCallCapablePhoneAccounts(); method public String getDefaultDialerPackage(); diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index c3e80b4800991..94ed7c30867b9 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1397,8 +1397,14 @@ public class TelecomManager { * * @return {@code true} if there is a call which will be rejected or terminated, {@code false} * otherwise. + * @deprecated Companion apps for wearable devices should use the {@link InCallService} API + * instead. Apps performing call screening should use the {@link CallScreeningService} API + * instead. */ + + @RequiresPermission(Manifest.permission.ANSWER_PHONE_CALLS) + @Deprecated public boolean endCall() { try { if (isServiceConnected()) { @@ -1419,11 +1425,15 @@ public class TelecomManager { * * Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE} or * {@link android.Manifest.permission#ANSWER_PHONE_CALLS} + * + * @deprecated Companion apps for wearable devices should use the {@link InCallService} API + * instead. */ //TODO: L-release - need to convert all invocation of ITelecmmService#answerRingingCall to use // this method (clockwork & gearhead). @RequiresPermission(anyOf = {Manifest.permission.ANSWER_PHONE_CALLS, Manifest.permission.MODIFY_PHONE_STATE}) + @Deprecated public void acceptRingingCall() { try { if (isServiceConnected()) { @@ -1442,9 +1452,12 @@ public class TelecomManager { * {@link android.Manifest.permission#ANSWER_PHONE_CALLS} * * @param videoState The desired video state to answer the call with. + * @deprecated Companion apps for wearable devices should use the {@link InCallService} API + * instead. */ @RequiresPermission(anyOf = {Manifest.permission.ANSWER_PHONE_CALLS, Manifest.permission.MODIFY_PHONE_STATE}) + @Deprecated public void acceptRingingCall(int videoState) { try { if (isServiceConnected()) {