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

Commit e5adf943 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Expose API isInEmergencySmsMode" am: afb05a64 

am: c5634216

Change-Id: I620ad9e5c268ea90b189cd8827909d8f1ba08aa2
parents 2fc63853 c5634216

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8637,6 +8637,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();

telephony/java/android/telephony/TelephonyManager.java

+3 −3
Original line number Diff line number Diff line
@@ -7594,20 +7594,20 @@ public class TelephonyManager { 
     * {@link CarrierConfigManager#KEY_EMERGENCY_SMS_MODE_TIMER_MS_INT}. If

     * the carrier does not support this mode, this function will always return false.

     *

     * @return true if this device is in emergency SMS mode, false otherwise.

     * @return {@code true} if this device is in emergency SMS mode, {@code false} otherwise.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isInEmergencySmsMode() {



        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.isInEmergencySmsMode();

            }

        } catch (RemoteException ex) {

            Rlog.e(TAG, "getNetworkSelectionMode RemoteException", ex);

            Rlog.e(TAG, "isInEmergencySmsMode RemoteException", ex);

        }

        return false;

    }