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

Commit 62e0cbee authored by Benjamin Löhner's avatar Benjamin Löhner Committed by Android (Google) Code Review
Browse files

Merge "Update getEmergencyAssistancePackageName's return to be @Nullable." into main

parents 11bfc112 c55d96a1

core/api/system-current.txt

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

    method @FlaggedApi("android.permission.flags.get_emergency_role_holder_api_enabled") @Nullable @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

+2 −3
Original line number Diff line number Diff line
@@ -15021,16 +15021,15 @@ public class TelephonyManager { 
     */

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @FlaggedApi(android.permission.flags.Flags.FLAG_GET_EMERGENCY_ROLE_HOLDER_API_ENABLED)

    @NonNull

    @Nullable

    @SystemApi

    public String getEmergencyAssistancePackageName() {

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

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

                + " not voice capable.");

        }

        String emergencyRole = mContext.getSystemService(RoleManager.class)

        return mContext.getSystemService(RoleManager.class)

                .getEmergencyRoleHolder(mContext.getUserId());

        return Objects.requireNonNull(emergencyRole, "Emergency role holder must not be null");

    }















    /**