From 1c285f0ac2ee901e4db82f8aecea02ad1c1c9999 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Mon, 22 Oct 2018 14:26:19 -0700 Subject: Re-add removed APIs per API council feedback. Some APIs were removed erroneously in the Q release; these methods were just deprecated in Q, Test: Make API, build Bug: 116801893 Change-Id: I38ddf8bcd9fe39f4ba50bc892ac2f6d20209f7a9 --- api/system-current.txt | 3 +++ api/system-removed.txt | 3 --- telephony/java/android/telephony/TelephonyManager.java | 15 +++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 082e06757fca..fd5f36165907 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5299,7 +5299,10 @@ package android.telephony { method public boolean handlePinMmi(java.lang.String); method public boolean handlePinMmiForSubscriber(int, java.lang.String); method public boolean isDataConnectivityPossible(); + method public deprecated boolean isIdle(); + method public deprecated boolean isOffhook(); method public deprecated boolean isRadioOn(); + method public deprecated boolean isRinging(); method public boolean isVideoCallingEnabled(); method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle); method public boolean needsOtaServiceProvisioning(); diff --git a/api/system-removed.txt b/api/system-removed.txt index 72b60e2e4db2..21b17cbe882b 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -148,9 +148,6 @@ package android.telephony { public class TelephonyManager { method public deprecated void answerRingingCall(); method public deprecated boolean endCall(); - method public deprecated boolean isIdle(); - method public deprecated boolean isOffhook(); - method public deprecated boolean isRinging(); method public deprecated void silenceRinger(); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c276ed3f5eed..1a9cb5b56741 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6560,7 +6560,7 @@ public class TelephonyManager { } /** - * @removed Use {@link android.telecom.TelecomManager#isInCall} instead + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead * @hide */ @Deprecated @@ -6570,11 +6570,12 @@ public class TelephonyManager { android.Manifest.permission.READ_PHONE_STATE }) public boolean isOffhook() { - return false; + TelecomManager tm = (TelecomManager) mContext.getSystemService(TELECOM_SERVICE); + return tm.isInCall(); } /** - * @removed Use {@link android.telecom.TelecomManager#isRinging} instead + * @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead * @hide */ @Deprecated @@ -6584,11 +6585,12 @@ public class TelephonyManager { android.Manifest.permission.READ_PHONE_STATE }) public boolean isRinging() { - return false; + TelecomManager tm = (TelecomManager) mContext.getSystemService(TELECOM_SERVICE); + return tm.isRinging(); } /** - * @removed Use {@link android.telecom.TelecomManager#isInCall} instead + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead * @hide */ @Deprecated @@ -6598,7 +6600,8 @@ public class TelephonyManager { android.Manifest.permission.READ_PHONE_STATE }) public boolean isIdle() { - return true; + TelecomManager tm = (TelecomManager) mContext.getSystemService(TELECOM_SERVICE); + return !tm.isInCall(); } /** -- cgit v1.2.3-59-g8ed1b