Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide isRttSupported in TelephonyManager"

Browse Source 
am: 3d834a0e69

Change-Id: I64743243d2a3d6ed140bf2d8370f46779fc74a95
This commit is contained in:
Hall Liu
2019-02-04 13:30:45 -08:00
committed by android-build-merger
parent e6d84ae4c9 3d834a0e69
commit 9f588cdd1c
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
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 @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
method public boolean isHearingAidCompatibilitySupported(); method public boolean isHearingAidCompatibilitySupported();
method public boolean isNetworkRoaming(); method public boolean isNetworkRoaming();
method public boolean isRttSupported();
method public boolean isSmsCapable(); method public boolean isSmsCapable();
method @Deprecated public boolean isTtyModeSupported(); method @Deprecated public boolean isTtyModeSupported();
method public boolean isVoiceCapable(); method public boolean isVoiceCapable();

1
api/test-current.txt
View File

@@ -1477,7 +1477,6 @@ package android.telephony {
public class TelephonyManager { public class TelephonyManager {
method public int getCarrierIdListVersion(); method public int getCarrierIdListVersion();
method public boolean isRttSupported();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
method public void setCarrierTestOverride(String, String, String, String, String, String, String); method public void setCarrierTestOverride(String, String, String, String, String, String, String);
field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -7858,9 +7858,7 @@ public class TelephonyManager {
* support for the feature and device firmware support. * support for the feature and device firmware support.
* *
* @return {@code true} if the device and carrier both support RTT, {@code false} otherwise. * @return {@code true} if the device and carrier both support RTT, {@code false} otherwise.
* @hide
*/ */
@TestApi
public boolean isRttSupported() { public boolean isRttSupported() {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();