Mark old APIs as @removed

Remove deprecated SystemApis as a part of a refactor.

Bug: 115943523
Test: unit, manual
Change-Id: Ic8955be6f57411ba18b5f049c6519d1c1d01d937
This commit is contained in:
Hall Liu
2018-09-17 18:10:58 -07:00
parent b65aca27af
commit 78b57077d6
3 changed files with 12 additions and 16 deletions

View File

@@ -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);

View File

@@ -143,3 +143,12 @@ package android.service.notification {
}
package android.telephony {
public class TelephonyManager {
method public deprecated void answerRingingCall();
method public deprecated boolean endCall();
}
}

View File

@@ -6260,36 +6260,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);
}
}
/**