summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sanket Padawe <sanketpadawe@google.com> 2017-09-13 04:39:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-09-13 04:39:36 +0000
commit8ccd08c76e32a6d3b4aeb1f953e8d3b684dcce64 (patch)
tree40f118b301c7c9aa5c6a37867073e95922996297
parente57a4f85bf1948d316a90ca354b5bf84aa99b448 (diff)
parent435e60b6bbdf0f7f0413c1ca452cc1e8841b51b1 (diff)
Merge "Fix doc for Telephony Manager api and make isTtySupported public."
-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 9c3929503a12..39944bf4f4ff 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -39524,6 +39524,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 9f5266626c50..aa9e5f93262f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -39815,6 +39815,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 719de12a7633..cde0bdfd08b0 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;
@@ -5775,7 +5776,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.