summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2017-09-07 05:07:15 -0700
committerSanket Padawe <sanketpadawe@google.com>2017-09-08 04:57:11 -0700
commit435e60b6bbdf0f7f0413c1ca452cc1e8841b51b1 (patch)
tree4d15d8a01452bde77f963e0dd463271b7b8bd696
parent037444ddaf6d36ef1ecf6172320c33afc7b46d6a (diff)
Fix doc for Telephony Manager api and make isTtySupported public.
TelephonyManager.isTtyModeSupported is public and we are deprecating that to use TelecomManager.isTtySupported which was system api, so making it public. Test: Build Bug: 62346128 Change-Id: Idfa146b03a3c3fdb20c563c4ea0dddf2c3399da6
-rw-r--r--api/current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java4
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java3
4 files changed, 5 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 87295c8acb64..da4bb9cc8d83 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -39523,6 +39523,7 @@ package android.telecom {
method public boolean isInManagedCall();
method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
+ method public boolean isTtySupported();
method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
method public void placeCall(android.net.Uri, android.os.Bundle);
method public void registerPhoneAccount(android.telecom.PhoneAccount);
diff --git a/api/test-current.txt b/api/test-current.txt
index 8f48a9fe0d8b..e6637d4d035e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -39802,6 +39802,7 @@ package android.telecom {
method public boolean isInManagedCall();
method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle);
method public boolean isOutgoingCallPermitted(android.telecom.PhoneAccountHandle);
+ method public boolean isTtySupported();
method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
method public void placeCall(android.net.Uri, android.os.Bundle);
method public void registerPhoneAccount(android.telecom.PhoneAccount);
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index b1eedf5cad4b..9e52c71be264 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1345,10 +1345,8 @@ public class TelecomManager {
/**
* Returns whether TTY is supported on this device.
- *
- * @hide
*/
- @SystemApi
+
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index cc469b57f337..eaabaad803d3 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -48,6 +48,7 @@ import android.provider.Settings.SettingNotFoundException;
import android.service.carrier.CarrierIdentifier;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
import android.telephony.VisualVoicemailService.VisualVoicemailTask;
import android.telephony.ims.feature.ImsFeature;
import android.util.Log;
@@ -5771,7 +5772,7 @@ public class TelephonyManager {
}
/**
- * @deprecated Use {@link android.telecom.TelecomManager#silenceRinger} instead
+ * @deprecated Use {@link TelecomManager#isTtySupported()} instead
* Whether the phone supports TTY mode.
*
* @return {@code true} if the device supports TTY mode, and {@code false} otherwise.