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

Commit 5dd4d207 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Add a new error case SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS" into main

parents 25626fcf 66c4140a

telephony/java/android/telephony/satellite/SatelliteManager.java

+10 −1
Original line number Diff line number Diff line
@@ -412,6 +412,14 @@ public final class SatelliteManager { 
    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final int SATELLITE_RESULT_LOCATION_NOT_AVAILABLE = 26;



    /**

     * Emergency call is in progress.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final int SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS = 27;



    /** @hide */

    @IntDef(prefix = {"SATELLITE_RESULT_"}, value = {

            SATELLITE_RESULT_SUCCESS,
@@ -440,7 +448,8 @@ public final class SatelliteManager { 
            SATELLITE_RESULT_ILLEGAL_STATE,

            SATELLITE_RESULT_MODEM_TIMEOUT,

            SATELLITE_RESULT_LOCATION_DISABLED,

            SATELLITE_RESULT_LOCATION_NOT_AVAILABLE

            SATELLITE_RESULT_LOCATION_NOT_AVAILABLE,

            SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface SatelliteResult {}