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

Merge "Merge "Unhide isRttSupported in TelephonyManager" am: 3d834a0e69 am: 9f588cdd1c am: 73a732630e"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-02-05 06:29:33 +00:00
committed by Android (Google) Code Review
parent 9cd0c8a6c6 1aab16e548
commit bc1995f7fe
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

@@ -45134,6 +45134,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();

1
api/test-current.txt
View File

@@ -2123,7 +2123,6 @@ package android.telephony {
public class TelephonyManager {
method public int checkCarrierPrivilegesForPackage(String);
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 CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe

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

@@ -7974,9 +7974,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();