diff options
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/system-removed.txt | 3 | ||||
| -rw-r--r-- | 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 f9f2bdac37d6..987d5a480f94 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6571,7 +6571,7 @@ public class TelephonyManager { } /** - * @removed Use {@link android.telecom.TelecomManager#isInCall} instead + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead * @hide */ @Deprecated @@ -6581,11 +6581,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 @@ -6595,11 +6596,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 @@ -6609,7 +6611,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(); } /** |