Merge "Unhide isRttSupported in TelephonyManager"

This commit is contained in:
Hall Liu
2019-02-04 21:15:04 +00:00
committed by Gerrit Code Review
3 changed files with 1 additions and 3 deletions

View File

@@ -43074,6 +43074,7 @@ package android.telephony {
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();

View File

@@ -1477,7 +1477,6 @@ package android.telephony {
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

View File

@@ -7858,9 +7858,7 @@ public class TelephonyManager {
* 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();