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

Commit b0b3244e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add SATELLITE_RESULT_DISABLE_IN_PROGRESS result code" into main

parents bc85652b d9de4bef

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

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

    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final int SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS = 27;

    public static final int SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS = 27;





    /**

     * Disabling satellite is in progress.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final int SATELLITE_RESULT_DISABLE_IN_PROGRESS = 28;



    /** @hide */

    /** @hide */

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

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

            SATELLITE_RESULT_SUCCESS,

            SATELLITE_RESULT_SUCCESS,
@@ -441,7 +449,8 @@ public final class SatelliteManager { 
            SATELLITE_RESULT_MODEM_TIMEOUT,

            SATELLITE_RESULT_MODEM_TIMEOUT,

            SATELLITE_RESULT_LOCATION_DISABLED,

            SATELLITE_RESULT_LOCATION_DISABLED,

            SATELLITE_RESULT_LOCATION_NOT_AVAILABLE,

            SATELLITE_RESULT_LOCATION_NOT_AVAILABLE,

            SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS

            SATELLITE_RESULT_EMERGENCY_CALL_IN_PROGRESS,

            SATELLITE_RESULT_DISABLE_IN_PROGRESS

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface SatelliteResult {}

    public @interface SatelliteResult {}

telephony/java/android/telephony/satellite/stub/ISatellite.aidl

+9 −0
Original line number Original line Diff line number Diff line
@@ -83,7 +83,16 @@ oneway interface ISatellite { 
     * is enabled, this may also disable the cellular modem, and if the satellite modem is disabled,

     * is enabled, this may also disable the cellular modem, and if the satellite modem is disabled,

     * this may also re-enable the cellular modem.

     * this may also re-enable the cellular modem.

     *

     *

     * Framework might send an enable request to update the enable attributes of an already-started

     * satellite session. In such cases, modem needs to apply the new enable attrbitues to the

     * satellite session. Moreover, modem needs to report its current state and signal strength

     * level to framework right after receiving this request from framework.

     *

     * Framework might send a disable request when an enable request is being processed. In such

     * cases, modem needs to abort the enable request and process the disable request.

     *

     * @param enableAttributes The enable parameters that will be applied to the satellite session

     * @param enableAttributes The enable parameters that will be applied to the satellite session

     * @param resultCallback The callback to receive the error code result of the operation.

     *

     *

     * Valid result codes returned:

     * Valid result codes returned:

     *   SatelliteResult:SATELLITE_RESULT_SUCCESS

     *   SatelliteResult:SATELLITE_RESULT_SUCCESS