diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-08-27 21:54:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-27 21:54:17 +0000 |
| commit | 342df6ddd178d55aa94e01ff94e5be00457f3440 (patch) | |
| tree | 14ba2205addeddff7c013869844e4621cb003ec8 | |
| parent | 4aee64f7750f66e00b8dc04302a98f7934b7cdb6 (diff) | |
| parent | f8f3e97cc55c08f23e913ea8f1c44748bf4ec0ed (diff) | |
Merge "Deprecate some system apis in TelephonyManager"
| -rw-r--r-- | api/system-current.txt | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 24 |
2 files changed, 24 insertions, 8 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 72cf0c71b167..41175798a1b0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5389,10 +5389,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 boolean isIdle(); - method public boolean isOffhook(); - method public boolean isRadioOn(); - method public boolean isRinging(); + 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/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 81d0d68fd92f..26bf7f8ef154 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6180,7 +6180,11 @@ public class TelephonyManager { } } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6197,7 +6201,11 @@ public class TelephonyManager { return false; } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6214,7 +6222,11 @@ public class TelephonyManager { return false; } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6231,7 +6243,11 @@ public class TelephonyManager { return true; } - /** @hide */ + /** + * @deprecated Use {@link android.telephony.TelephonyManager#getServiceState} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, |