Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark old APIs as @removed"

Browse Source
This commit is contained in:
Hall Liu
2018-09-19 18:09:01 +00:00
committed by Gerrit Code Review
parent 7cba8a7fe4 78b57077d6
commit 999be29822
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5230,7 +5230,6 @@ package android.telephony {
} }
public class TelephonyManager { public class TelephonyManager {
method public deprecated void answerRingingCall();
method public deprecated void call(java.lang.String, java.lang.String); method public deprecated void call(java.lang.String, java.lang.String);
method public int checkCarrierPrivilegesForPackage(java.lang.String); method public int checkCarrierPrivilegesForPackage(java.lang.String);
method public int checkCarrierPrivilegesForPackageAnyPhone(java.lang.String); method public int checkCarrierPrivilegesForPackageAnyPhone(java.lang.String);
@@ -5238,7 +5237,6 @@ package android.telephony {
method public boolean disableDataConnectivity(); method public boolean disableDataConnectivity();
method public boolean enableDataConnectivity(); method public boolean enableDataConnectivity();
method public void enableVideoCalling(boolean); 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<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> getCarrierPackageNamesForIntent(android.content.Intent);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int); method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);

9
api/system-removed.txt
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();
}
}

17
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -6261,36 +6261,25 @@ public class TelephonyManager {
/** /**
* @deprecated Use {@link android.telecom.TelecomManager#endCall()} instead. * @deprecated Use {@link android.telecom.TelecomManager#endCall()} instead.
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.CALL_PHONE) @RequiresPermission(android.Manifest.permission.CALL_PHONE)
public boolean endCall() { 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; return false;
} }
/** /**
* @deprecated Use {@link android.telecom.TelecomManager#acceptRingingCall} instead * @deprecated Use {@link android.telecom.TelecomManager#acceptRingingCall} instead
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void answerRingingCall() { public void answerRingingCall() {
try {
ITelephony telephony = getITelephony();
if (telephony != null)
telephony.answerRingingCall();
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#answerRingingCall", e);
}
} }
/** /**