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

Commit 38076cdc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add system API for whether emergency assistance is enabled."

parents 94edd0c7 953a8032

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8033,6 +8033,7 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduBasicChannelBySlot(int, int, int, int, int, int, @Nullable String);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduLogicalChannelBySlot(int, int, int, int, int, int, int, @Nullable String);

    method public boolean isDataConnectivityPossible();

    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 @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);

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ applications that come with the platform 
        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>

        <permission name="android.permission.APPROVE_INCIDENT_REPORTS"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    </privapp-permissions>



    <privapp-permissions package="com.android.phone">

telephony/java/android/telephony/TelephonyManager.java

+18 −0
Original line number Diff line number Diff line
@@ -10191,6 +10191,24 @@ public class TelephonyManager { 
        }

    }



    /**

     * Determine whether the emergency assistance feature is available on the device.

     * <p>

     * Requires permission: {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE}

     *

     * @return whether the emergency assistance feature is available on the device

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @SystemApi

    public boolean isEmergencyAssistanceEnabled() {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                "isEmergencyAssistanceEnabled");

        return EMERGENCY_ASSISTANCE_ENABLED;

    }



    /**

     * Get the emergency number list based on current locale, sim, default, modem and network.

     *