diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/system-removed.txt | 9 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 17 |
3 files changed, 12 insertions, 16 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 1df9a466ddc7..e3f52a0f2d21 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5230,7 +5230,6 @@ package android.telephony { } public class TelephonyManager { - method public deprecated void answerRingingCall(); method public deprecated void call(java.lang.String, java.lang.String); method public int checkCarrierPrivilegesForPackage(java.lang.String); method public int checkCarrierPrivilegesForPackageAnyPhone(java.lang.String); @@ -5238,7 +5237,6 @@ package android.telephony { method public boolean disableDataConnectivity(); method public boolean enableDataConnectivity(); method public void enableVideoCalling(boolean); - method public deprecated boolean endCall(); method public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int); method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent); method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int); diff --git a/api/system-removed.txt b/api/system-removed.txt index 961026b827e8..69ad3ea00018 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -143,3 +143,12 @@ package android.service.notification { } +package android.telephony { + + public class TelephonyManager { + method public deprecated void answerRingingCall(); + method public deprecated boolean endCall(); + } + +} + diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 7584793783e7..ffdafa13c7bb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6244,36 +6244,25 @@ public class TelephonyManager { /** * @deprecated Use {@link android.telecom.TelecomManager#endCall()} instead. * @hide + * @removed */ @Deprecated @SystemApi @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall() { - try { - ITelephony telephony = getITelephony(); - if (telephony != null) - return telephony.endCall(); - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelephony#endCall", e); - } return false; } /** * @deprecated Use {@link android.telecom.TelecomManager#acceptRingingCall} instead * @hide + * @removed */ @Deprecated @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall() { - try { - ITelephony telephony = getITelephony(); - if (telephony != null) - telephony.answerRingingCall(); - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelephony#answerRingingCall", e); - } + } /** |