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

Commit b7378c4f authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Sarah Chin
Browse files

Rename some satellite APIs 

Bug: 269334950
Test: atest android.telephony.cts.SatelliteManagerTest

Change-Id: Ia09453c84a1788d56048f7faa33216db50cf0c46
parent fe9e1587

src/java/com/android/internal/telephony/Phone.java

+6 −4
Original line number Diff line number Diff line
@@ -5334,23 +5334,25 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    }



    /**

     * Registers for messages transfer complete from satellite modem.

     * Registers for datagrams delivered events from satellite modem.

     *

     * @param h Handler for notification message.

     * @param what User-defined message code.

     * @param obj User object.

     */

    public void registerForSatelliteMessagesTransferComplete(@NonNull Handler h,

    public void registerForSatelliteDatagramsDelivered(@NonNull Handler h,

            int what, @Nullable Object obj) {

        //TODO: Rename CommandsInterface and other modules when updating HAL APIs.

        mCi.registerForSatelliteMessagesTransferComplete(h, what, obj);

    }



    /**

     * Unregisters for messages transfer complete from satellite modem.

     * Unregisters for datagrams delivered events from satellite modem.

     *

     * @param h Handler to be removed from the registrant list.

     */

    public void unregisterForSatelliteMessagesTransferComplete(@NonNull Handler h) {

    public void unregisterForSatelliteDatagramsDelivered(@NonNull Handler h) {

        //TODO: Rename CommandsInterface and other modules when updating HAL APIs.

        mCi.unregisterForSatelliteMessagesTransferComplete(h);

    }

src/java/com/android/internal/telephony/satellite/SatelliteServiceController.java

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ public class SatelliteServiceController { 
            case SatelliteModemState.SATELLITE_MODEM_STATE_LISTENING:

                return SatelliteManager.SATELLITE_MODEM_STATE_LISTENING;

            case SatelliteModemState.SATELLITE_MODEM_STATE_MESSAGE_TRANSFERRING:

                return SatelliteManager.SATELLITE_MODEM_STATE_MESSAGE_TRANSFERRING;

                return SatelliteManager.SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING;

            case SatelliteModemState.SATELLITE_MODEM_STATE_OFF:

                return SatelliteManager.SATELLITE_MODEM_STATE_OFF;

        }