commit 3d834a0e692d5bec9874ff8d87ac8be84d741eab
author Hall Liu <hallliu@google.com> Mon Feb 04 21:15:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 04 21:15:04 2019 +0000
tree 45c0a9676bc33d5189b2f1e17f740fb4ec36c6d8
parent 171dfad60c6d0471728bbcdabcce62ca9f97e75b
parent 5a0f2501c554ca328cab2060fc6c2aef666fc8f7

Merge "Unhide isRttSupported in TelephonyManager"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index ce12b52..c386819 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -43074,6 +43074,7 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
     method public boolean isHearingAidCompatibilitySupported();
     method public boolean isNetworkRoaming();
+    method public boolean isRttSupported();
     method public boolean isSmsCapable();
     method @Deprecated public boolean isTtyModeSupported();
     method public boolean isVoiceCapable();

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index e4f999b..34c8f6e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1477,7 +1477,6 @@
 
   public class TelephonyManager {
     method public int getCarrierIdListVersion();
-    method public boolean isRttSupported();
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
     method public void setCarrierTestOverride(String, String, String, String, String, String, String);
     field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index d5b543b..d857fd0 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -7858,9 +7858,7 @@
      * support for the feature and device firmware support.
      *
      * @return {@code true} if the device and carrier both support RTT, {@code false} otherwise.
-     * @hide
      */
-    @TestApi
     public boolean isRttSupported() {
         try {
             ITelephony telephony = getITelephony();