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

Commit 66c4140a authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Add a new error case SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS 

There is a case when user attempts emergency call, satellite is still getting the location information then enable it later this causes scenario conflict.
Therefore it is needed to block enabling satellite when user is attempting emergency call and let application to know the reason.

Bug: 355740633
Flag: EXEMPT bugfix
Test: manually e2e test whether satellite is enabled when user is attempting emergency call
      atest SatelliteControllerTest
Change-Id: I5321e30894b976e04f4b40a512cdf359cc08d4fe
parent 0e4056a7

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 {}