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

Commit 9eea7bee authored by Benjamin Löhner's avatar Benjamin Löhner
Browse files

Rename getEmergencyAssistancePackage to getEmergencyAssistancePackageName. 

This change is implementing feedback from the Android API council.

Bug: 327182141
Change-Id: I3b2f001136377c97841fdaf489f78696f31addbb
Test: presubmit
parent 0fb77156

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15316,7 +15316,7 @@ package android.telephony { 
    method @Deprecated public boolean getDataEnabled(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getDefaultRespondViaMessageApplication();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getDeviceSoftwareVersion(int);

    method @FlaggedApi("android.permission.flags.get_emergency_role_holder_api_enabled") @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getEmergencyAssistancePackage();

    method @FlaggedApi("android.permission.flags.get_emergency_role_holder_api_enabled") @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getEmergencyAssistancePackageName();

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -15023,7 +15023,7 @@ public class TelephonyManager { 
    @FlaggedApi(android.permission.flags.Flags.FLAG_GET_EMERGENCY_ROLE_HOLDER_API_ENABLED)

    @NonNull

    @SystemApi

    public String getEmergencyAssistancePackage() {

    public String getEmergencyAssistancePackageName() {

        if (!isEmergencyAssistanceEnabled() || !isVoiceCapable()) {

            throw new IllegalStateException("isEmergencyAssistanceEnabled() is false or device"

                + " not voice capable.");