Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aab16e5 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Unhide isRttSupported in TelephonyManager" am: 3d834a0e am: 9f588cdd 

am: 73a73263

Change-Id: I2f3d50be4c109cae5a85fcfae49ad6d279a55733
parents d832ebaf 73a73263

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/TelephonyManager.java

+0 −2
Original line number Diff line number Diff line
@@ -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();