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

Commit fa62dce0 authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

Add new satellite datagram transfer state for NB IOT 

Bug: 300483339
Test: SMS, MMS, call with live network.
atest SatelliteSessionControllerTest
atest DatagramDispatcherTest DatagramReceiverTest
atest SatelliteSOSMessageRecommenderTest
atest SatelliteControllerTest
atest SatelliteManagerTestOnMockService

Change-Id: I1b972cb8bbd3dd0d7577ded26eabb0a6eafd6a65
parent e1859f9c

core/api/system-current.txt

+1 −0
Original line number Original line 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_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_SEND_SUCCESS = 2; // 0x2

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

    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 @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_RETRYING = 3; // 0x3

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

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

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

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

     * will be sent if no more messages are pending.

     */

     */

    public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED = 7;

    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

     * 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

     * 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_SUCCESS,

            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE,

            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE,

            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,

            SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,

            SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT,

            SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN

            SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)