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

Commit 73a73263 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Unhide isRttSupported in TelephonyManager" am: 3d834a0e 

am: 9f588cdd

Change-Id: I0f13227568f8268bc061fe793f66df02362841c3
parents 6cb189e3 9f588cdd

api/current.txt

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

telephony/java/android/telephony/TelephonyManager.java

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