Merge "Mark old APIs as @removed" am: 999be29822 am: bcc49768e2 (1eb58880) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -5405,7 +5405,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);
		@@ -5413,7 +5412,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);

+9 −0

Original line number	Diff line number	Diff line
		@@ -143,3 +143,12 @@ package android.service.notification {

		}

		package android.telephony {

		public class TelephonyManager {
		method public deprecated void answerRingingCall();
		method public deprecated boolean endCall();
		}

		}

+3 −14

Original line number	Diff line number	Diff line
		@@ -6217,36 +6217,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);
		}

		}

		/**