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

Commit 576099b9 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Add new satellite datagram transfer state for NB IOT" into main

parents 30913c44 fa62dce0

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16706,6 +16706,7 @@ package android.telephony.satellite { 
    field public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED = 3; // 0x3

    field public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS = 2; // 0x2

    field public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN = -1; // 0xffffffff

    field @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT = 8; // 0x8

    field @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_CONNECTED = 7; // 0x7

    field public static final int SATELLITE_MODEM_STATE_DATAGRAM_RETRYING = 3; // 0x3

    field public static final int SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING = 2; // 0x2

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

+12 −0
Original line number Diff line number Diff line
@@ -723,6 +723,17 @@ public final class SatelliteManager { 
     * will be sent if no more messages are pending.

     */

    public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED = 7;

    /**

     * A transition state indicating that Telephony is waiting for satellite modem to connect to a

     * satellite network before sending a datagram or polling for datagrams. If the satellite modem

     * successfully connects to a satellite network, either

     * {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING} or

     * {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING} will be sent. Otherwise,

     * either {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED} or

     * {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED} will be sent.

     */

    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT = 8;

    /**

     * The datagram transfer state is unknown. This generic datagram transfer state should be used

     * only when the datagram transfer state cannot be mapped to other specific datagram transfer
@@ -740,6 +751,7 @@ public final class SatelliteManager { 
            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS,

            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE,

            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,

            SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT,

            SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN

    })

    @Retention(RetentionPolicy.SOURCE)