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

Commit 22ac7bd7 authored by Aishwarya Mallamapti's avatar Aishwarya Mallamapti
Browse files

Change SatelliteError to SatelliteResult enum 

The following changes are made in this cl:
- SatelliteError is changed to SatelliteResult
- SATELLITE_ERROR_NONE is changed to SATELLITE_RESULT_SUCCESS
- SATELLITE_RESULT prefix is added to all the values in the enum

Bug: 296925011
Test: Flashed device on raven-userdebug and performed basic
functionality tests
- atest android.telephony.satellite.cts
- atest com.android.internal.telephony.satellite
- atest com.google.android.telephony.satellite

Change-Id: Ib0d0c888d59e0aaf5e8a77e3673f9e8900560cf1
parent 4564170b

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

+14 −14
Original line number Diff line number Diff line
@@ -5760,7 +5760,7 @@ public class RILUtils { 
     * @param error The satellite error.

     * @return The converted SatelliteServiceResult.

     */

    @SatelliteManager.SatelliteError

    @SatelliteManager.SatelliteResult

    public static int convertToSatelliteError(

            CommandException.Error error) {

        switch (error) {
@@ -5769,35 +5769,35 @@ public class RILUtils { 
            case MODEM_ERR:

                //fallthrough to SYSTEM_ERR

            case SYSTEM_ERR:

                return SatelliteManager.SATELLITE_MODEM_ERROR;

                return SatelliteManager.SATELLITE_RESULT_MODEM_ERROR;

            case INVALID_ARGUMENTS:

                return SatelliteManager.SATELLITE_INVALID_ARGUMENTS;

                return SatelliteManager.SATELLITE_RESULT_INVALID_ARGUMENTS;

            case INVALID_MODEM_STATE:

                return SatelliteManager.SATELLITE_INVALID_MODEM_STATE;

                return SatelliteManager.SATELLITE_RESULT_INVALID_MODEM_STATE;

            case RADIO_NOT_AVAILABLE:

                return SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE;

                return SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE;

            case REQUEST_NOT_SUPPORTED:

                return SatelliteManager.SATELLITE_REQUEST_NOT_SUPPORTED;

                return SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;

            case NO_MEMORY:

                //fallthrough to NO_RESOURCES

            case NO_RESOURCES:

                return SatelliteManager.SATELLITE_NO_RESOURCES;

                return SatelliteManager.SATELLITE_RESULT_NO_RESOURCES;

            case NETWORK_ERR:

                return SatelliteManager.SATELLITE_NETWORK_ERROR;

                return SatelliteManager.SATELLITE_RESULT_NETWORK_ERROR;

            case NETWORK_TIMEOUT:

                return SatelliteManager.SATELLITE_NETWORK_TIMEOUT;

                return SatelliteManager.SATELLITE_RESULT_NETWORK_TIMEOUT;

            case NO_NETWORK_FOUND:

                //fallthrough to NO_SATELLITE_SIGNAL

            case NO_SATELLITE_SIGNAL:

                return SatelliteManager.SATELLITE_NOT_REACHABLE;

                return SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE;

            case ABORTED:

                return SatelliteManager.SATELLITE_REQUEST_ABORTED;

                return SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED;

            case ACCESS_BARRED:

                return SatelliteManager.SATELLITE_ACCESS_BARRED;

                return SatelliteManager.SATELLITE_RESULT_ACCESS_BARRED;

            case SUBSCRIBER_NOT_AUTHORIZED:

                return SatelliteManager.SATELLITE_NOT_AUTHORIZED;

                return SatelliteManager.SATELLITE_RESULT_NOT_AUTHORIZED;

            default:

                return SatelliteManager.SATELLITE_ERROR;

                return SatelliteManager.SATELLITE_RESULT_ERROR;

        }

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class DatagramController { 
    @GuardedBy("mLock")

    private int mSendPendingCount = 0;

    @GuardedBy("mLock")

    private int mSendErrorCode = SatelliteManager.SATELLITE_ERROR_NONE;

    private int mSendErrorCode = SatelliteManager.SATELLITE_RESULT_SUCCESS;

    /** Variables used to update onReceiveDatagramStateChanged(). */

    @GuardedBy("mLock")

    private int mReceiveSubId;
@@ -69,7 +69,7 @@ public class DatagramController { 
    @GuardedBy("mLock")

    private int mReceivePendingCount = 0;

    @GuardedBy("mLock")

    private int mReceiveErrorCode = SatelliteManager.SATELLITE_ERROR_NONE;

    private int mReceiveErrorCode = SatelliteManager.SATELLITE_RESULT_SUCCESS;



    private SatelliteDatagram mDemoModeDatagram;

    private boolean mIsDemoMode = false;
@@ -130,9 +130,9 @@ public class DatagramController { 
     * @param subId The subId of the subscription to register for incoming satellite datagrams.

     * @param callback The callback to handle incoming datagrams over satellite.

     *

     * @return The {@link SatelliteManager.SatelliteError} result of the operation.

     * @return The {@link SatelliteManager.SatelliteResult} result of the operation.

     */

    @SatelliteManager.SatelliteError public int registerForSatelliteDatagram(int subId,

    @SatelliteManager.SatelliteResult public int registerForSatelliteDatagram(int subId,

            @NonNull ISatelliteDatagramCallback callback) {

        return mDatagramReceiver.registerForSatelliteDatagram(subId, callback);

    }
@@ -159,7 +159,7 @@ public class DatagramController { 
     * long, SatelliteDatagram, int, Consumer)}

     *

     * @param subId The subId of the subscription used for receiving datagrams.

     * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.

     * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.

     */

    public void pollPendingSatelliteDatagrams(int subId, @NonNull Consumer<Integer> callback) {

        mDatagramReceiver.pollPendingSatelliteDatagrams(subId, callback);
@@ -182,7 +182,7 @@ public class DatagramController { 
     *                 Datagram will be passed down to modem without any encoding or encryption.

     * @param needFullScreenPointingUI this is used to indicate pointingUI app to open in

     *                                 full screen mode.

     * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.

     * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.

     */

    public void sendSatelliteDatagram(int subId, @SatelliteManager.DatagramType int datagramType,

            @NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,

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

+20 −20
Original line number Diff line number Diff line
@@ -212,20 +212,20 @@ public class DatagramDispatcher extends Handler { 
                        mDatagramController.updateSendStatus(argument.subId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,

                                getPendingDatagramCount(),

                                SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                                SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

                        mDatagramController.updateSendStatus(argument.subId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                                0, SatelliteManager.SATELLITE_ERROR_NONE);

                                0, SatelliteManager.SATELLITE_RESULT_SUCCESS);



                        // report phone == null case

                        reportSendDatagramCompleted(argument,

                                SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                                SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

                        argument.callback.accept(

                                SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                                SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);



                        // Abort sending all the pending datagrams

                        abortSendingPendingDatagrams(argument.subId,

                                SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                                SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

                    }

                }

                break;
@@ -239,7 +239,7 @@ public class DatagramDispatcher extends Handler { 
                        (SendSatelliteDatagramArgument) request.argument;



                synchronized (mLock) {

                    if (mIsDemoMode && (error == SatelliteManager.SATELLITE_ERROR_NONE)) {

                    if (mIsDemoMode && (error == SatelliteManager.SATELLITE_RESULT_SUCCESS)) {

                        if (argument.skipCheckingSatelliteAligned) {

                            logd("Satellite was already aligned. No need to check alignment again");

                        } else if (!mIsAligned) {
@@ -262,7 +262,7 @@ public class DatagramDispatcher extends Handler { 
                        mPendingNonEmergencyDatagramsMap.remove(argument.datagramId);

                    }



                    if (error == SatelliteManager.SATELLITE_ERROR_NONE) {

                    if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {

                        // Update send status for current datagram

                        mDatagramController.updateSendStatus(argument.subId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS,
@@ -278,7 +278,7 @@ public class DatagramDispatcher extends Handler { 
                        } else {

                            mDatagramController.updateSendStatus(argument.subId,

                                    SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                                    0, SatelliteManager.SATELLITE_ERROR_NONE);

                                    0, SatelliteManager.SATELLITE_RESULT_SUCCESS);

                            // Send response for current datagram

                            argument.callback.accept(error);

                        }
@@ -289,7 +289,7 @@ public class DatagramDispatcher extends Handler { 
                                getPendingDatagramCount(), error);

                        mDatagramController.updateSendStatus(argument.subId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                                0, SatelliteManager.SATELLITE_ERROR_NONE);

                                0, SatelliteManager.SATELLITE_RESULT_SUCCESS);

                        // Send response for current datagram

                        // after updating datagram transfer state internally.

                        argument.callback.accept(error);
@@ -297,7 +297,7 @@ public class DatagramDispatcher extends Handler { 
                        mControllerMetricsStats.reportOutgoingDatagramFailCount(

                                argument.datagramType);

                        abortSendingPendingDatagrams(argument.subId,

                                SatelliteManager.SATELLITE_REQUEST_ABORTED);

                                SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);

                    }

                }

                break;
@@ -328,7 +328,7 @@ public class DatagramDispatcher extends Handler { 
     *                 Datagram will be passed down to modem without any encoding or encryption.

     * @param needFullScreenPointingUI this is used to indicate pointingUI app to open in

     *                                 full screen mode.

     * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.

     * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.

     */

    public void sendSatelliteDatagram(int subId, @SatelliteManager.DatagramType int datagramType,

            @NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,
@@ -356,7 +356,7 @@ public class DatagramDispatcher extends Handler { 
                datagramArgs.setDatagramStartTime();

                mDatagramController.updateSendStatus(subId,

                        SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING,

                        getPendingDatagramCount(), SatelliteManager.SATELLITE_ERROR_NONE);

                        getPendingDatagramCount(), SatelliteManager.SATELLITE_RESULT_SUCCESS);

                sendRequestAsync(CMD_SEND_SATELLITE_DATAGRAM, datagramArgs, phone);

            }

        }
@@ -426,7 +426,7 @@ public class DatagramDispatcher extends Handler { 
            @NonNull DatagramDispatcherHandlerRequest request) {

        SatelliteManager.SatelliteException exception =

                new SatelliteManager.SatelliteException(

                        SatelliteManager.SATELLITE_NOT_REACHABLE);

                        SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);

        Message message = obtainMessage(EVENT_SEND_SATELLITE_DATAGRAM_DONE, request);

        AsyncResult.forMessage(message, null, exception);

        message.sendToTarget();
@@ -474,7 +474,7 @@ public class DatagramDispatcher extends Handler { 
            datagramArg.setDatagramStartTime();

            mDatagramController.updateSendStatus(datagramArg.subId,

                    SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING,

                    getPendingDatagramCount(), SatelliteManager.SATELLITE_ERROR_NONE);

                    getPendingDatagramCount(), SatelliteManager.SATELLITE_RESULT_SUCCESS);

            sendRequestAsync(CMD_SEND_SATELLITE_DATAGRAM, datagramArg, phone);

        }

    }
@@ -488,7 +488,7 @@ public class DatagramDispatcher extends Handler { 
    @GuardedBy("mLock")

    private void sendErrorCodeAndCleanupPendingDatagrams(

            LinkedHashMap<Long, SendSatelliteDatagramArgument> pendingDatagramsMap,

            @SatelliteManager.SatelliteError int errorCode) {

            @SatelliteManager.SatelliteResult int errorCode) {

        if (pendingDatagramsMap.size() == 0) {

            return;

        }
@@ -515,7 +515,7 @@ public class DatagramDispatcher extends Handler { 
     */

    @GuardedBy("mLock")

    private void abortSendingPendingDatagrams(int subId,

            @SatelliteManager.SatelliteError int errorCode) {

            @SatelliteManager.SatelliteResult int errorCode) {

        logd("abortSendingPendingDatagrams()");

        sendErrorCodeAndCleanupPendingDatagrams(mPendingEmergencyDatagramsMap, errorCode);

        sendErrorCodeAndCleanupPendingDatagrams(mPendingNonEmergencyDatagramsMap, errorCode);
@@ -545,7 +545,7 @@ public class DatagramDispatcher extends Handler { 
    }



    private void reportSendDatagramCompleted(@NonNull SendSatelliteDatagramArgument argument,

            @NonNull @SatelliteManager.SatelliteError int resultCode) {

            @NonNull @SatelliteManager.SatelliteResult int resultCode) {

        SatelliteStats.getInstance().onSatelliteOutgoingDatagramMetrics(

                new SatelliteStats.SatelliteOutgoingDatagramParams.Builder()

                        .setDatagramType(argument.datagramType)
@@ -589,13 +589,13 @@ public class DatagramDispatcher extends Handler { 
            mDatagramController.updateSendStatus(

                    SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,

                    SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,

                    getPendingDatagramCount(), SatelliteManager.SATELLITE_REQUEST_ABORTED);

                    getPendingDatagramCount(), SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);

        }

        mDatagramController.updateSendStatus(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,

                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                0, SatelliteManager.SATELLITE_ERROR_NONE);

                0, SatelliteManager.SATELLITE_RESULT_SUCCESS);

        abortSendingPendingDatagrams(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,

                SatelliteManager.SATELLITE_REQUEST_ABORTED);

                SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);



        stopSatelliteAlignedTimer();

        mIsDemoMode = false;

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

+27 −27
Original line number Diff line number Diff line
@@ -329,11 +329,11 @@ public class DatagramReceiver extends Handler { 
                    if (pendingCount <= 0 && satelliteDatagram == null) {

                        sInstance.mDatagramController.updateReceiveStatus(mSubId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE,

                                pendingCount, SatelliteManager.SATELLITE_ERROR_NONE);

                                pendingCount, SatelliteManager.SATELLITE_RESULT_SUCCESS);

                    } else if (satelliteDatagram != null) {

                        sInstance.mDatagramController.updateReceiveStatus(mSubId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS,

                                pendingCount, SatelliteManager.SATELLITE_ERROR_NONE);

                                pendingCount, SatelliteManager.SATELLITE_RESULT_SUCCESS);



                        long datagramId = getDatagramId();

                        sInstance.mPendingAckCountHashMap.put(datagramId, getNumOfListeners());
@@ -350,13 +350,13 @@ public class DatagramReceiver extends Handler { 
                        });



                        sInstance.mControllerMetricsStats.reportIncomingDatagramCount(

                                SatelliteManager.SATELLITE_ERROR_NONE);

                                SatelliteManager.SATELLITE_RESULT_SUCCESS);

                    }



                    if (pendingCount <= 0) {

                        sInstance.mDatagramController.updateReceiveStatus(mSubId,

                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                                pendingCount, SatelliteManager.SATELLITE_ERROR_NONE);

                                pendingCount, SatelliteManager.SATELLITE_RESULT_SUCCESS);

                    } else {

                        // Poll for pending datagrams

                        IIntegerConsumer internalCallback = new IIntegerConsumer.Stub() {
@@ -372,7 +372,7 @@ public class DatagramReceiver extends Handler { 


                    // Send the captured data about incoming datagram to metric

                    sInstance.reportMetrics(

                            satelliteDatagram, SatelliteManager.SATELLITE_ERROR_NONE);

                            satelliteDatagram, SatelliteManager.SATELLITE_RESULT_SUCCESS);

                    break;

                }
@@ -433,19 +433,19 @@ public class DatagramReceiver extends Handler { 
                    mDatagramController.updateReceiveStatus(request.subId,

                            SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,

                            mDatagramController.getReceivePendingCount(),

                            SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                            SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);



                    mDatagramController.updateReceiveStatus(request.subId,

                            SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                            mDatagramController.getReceivePendingCount(),

                            SatelliteManager.SATELLITE_ERROR_NONE);

                            SatelliteManager.SATELLITE_RESULT_SUCCESS);



                    reportMetrics(null, SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                    reportMetrics(null, SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

                    mControllerMetricsStats.reportIncomingDatagramCount(

                                    SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                                    SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

                    // Send response for current request

                    ((Consumer<Integer>) request.argument)

                            .accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);

                            .accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

                }

                break;

            }
@@ -456,7 +456,7 @@ public class DatagramReceiver extends Handler { 
                int error = SatelliteServiceUtils.getSatelliteError(ar,

                        "pollPendingSatelliteDatagrams");



                if (mIsDemoMode && error == SatelliteManager.SATELLITE_ERROR_NONE) {

                if (mIsDemoMode && error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {

                    SatelliteDatagram datagram = mDatagramController.getDemoModeDatagram();

                    final int validSubId = SatelliteServiceUtils.getValidSatelliteSubId(

                            request.subId, mContext);
@@ -470,12 +470,12 @@ public class DatagramReceiver extends Handler { 
                                ar);

                        listenerHandler.sendMessage(message);

                    } else {

                        error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;

                        error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;

                    }

                }



                logd("EVENT_POLL_PENDING_SATELLITE_DATAGRAMS_DONE error: " + error);

                if (error != SatelliteManager.SATELLITE_ERROR_NONE) {

                if (error != SatelliteManager.SATELLITE_RESULT_SUCCESS) {

                    mDatagramController.updateReceiveStatus(request.subId,

                            SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,

                            mDatagramController.getReceivePendingCount(), error);
@@ -483,7 +483,7 @@ public class DatagramReceiver extends Handler { 
                    mDatagramController.updateReceiveStatus(request.subId,

                            SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,

                            mDatagramController.getReceivePendingCount(),

                            SatelliteManager.SATELLITE_ERROR_NONE);

                            SatelliteManager.SATELLITE_RESULT_SUCCESS);



                    reportMetrics(null, error);

                    mControllerMetricsStats.reportIncomingDatagramCount(error);
@@ -506,12 +506,12 @@ public class DatagramReceiver extends Handler { 
     * @param subId The subId of the subscription to register for incoming satellite datagrams.

     * @param callback The callback to handle incoming datagrams over satellite.

     *

     * @return The {@link SatelliteManager.SatelliteError} result of the operation.

     * @return The {@link SatelliteManager.SatelliteResult} result of the operation.

     */

    @SatelliteManager.SatelliteError public int registerForSatelliteDatagram(int subId,

    @SatelliteManager.SatelliteResult public int registerForSatelliteDatagram(int subId,

            @NonNull ISatelliteDatagramCallback callback) {

        if (!SatelliteController.getInstance().isSatelliteSupported()) {

            return SatelliteManager.SATELLITE_NOT_SUPPORTED;

            return SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;

        }



        final int validSubId = SatelliteServiceUtils.getValidSatelliteSubId(subId, mContext);
@@ -533,7 +533,7 @@ public class DatagramReceiver extends Handler { 


        satelliteDatagramListenerHandler.addListener(callback);

        mSatelliteDatagramListenerHandlers.put(validSubId, satelliteDatagramListenerHandler);

        return SatelliteManager.SATELLITE_ERROR_NONE;

        return SatelliteManager.SATELLITE_RESULT_SUCCESS;

    }



    /**
@@ -576,13 +576,13 @@ public class DatagramReceiver extends Handler { 
     * #onSatelliteDatagramReceived(long, SatelliteDatagram, int, Consumer)}

     *

     * @param subId The subId of the subscription used for receiving datagrams.

     * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.

     * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.

     */

    public void pollPendingSatelliteDatagrams(int subId, @NonNull Consumer<Integer> callback) {

        if (!mDatagramController.isPollingInIdleState()) {

            // Poll request should be sent to satellite modem only when it is free.

            logd("pollPendingSatelliteDatagrams: satellite modem is busy receiving datagrams.");

            callback.accept(SatelliteManager.SATELLITE_MODEM_BUSY);

            callback.accept(SatelliteManager.SATELLITE_RESULT_MODEM_BUSY);

            return;

        }
@@ -594,14 +594,14 @@ public class DatagramReceiver extends Handler { 
        if (!mDatagramController.isSendingInIdleState()) {

            // Poll request should be sent to satellite modem only when it is free.

            logd("pollPendingSatelliteDatagrams: satellite modem is busy sending datagrams.");

            callback.accept(SatelliteManager.SATELLITE_MODEM_BUSY);

            callback.accept(SatelliteManager.SATELLITE_RESULT_MODEM_BUSY);

            return;

        }



        mDatagramController.updateReceiveStatus(subId,

                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING,

                mDatagramController.getReceivePendingCount(),

                SatelliteManager.SATELLITE_ERROR_NONE);

                SatelliteManager.SATELLITE_RESULT_SUCCESS);

        mDatagramTransferStartTime = System.currentTimeMillis();

        Phone phone = SatelliteServiceUtils.getPhone();
@@ -649,7 +649,7 @@ public class DatagramReceiver extends Handler { 
            } else {

                Consumer<Integer> callback =

                        (Consumer<Integer>) mPollPendingSatelliteDatagramsRequest.argument;

                callback.accept(SatelliteManager.SATELLITE_REQUEST_ABORTED);

                callback.accept(SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);

            }

        }

        mIsDemoMode = false;
@@ -663,11 +663,11 @@ public class DatagramReceiver extends Handler { 
            mDatagramController.updateReceiveStatus(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,

                    SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,

                    mDatagramController.getReceivePendingCount(),

                    SatelliteManager.SATELLITE_REQUEST_ABORTED);

                    SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);

        }

        mDatagramController.updateReceiveStatus(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,

                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE, 0,

                SatelliteManager.SATELLITE_ERROR_NONE);

                SatelliteManager.SATELLITE_RESULT_SUCCESS);

        cleanupDemoModeResources();

    }
@@ -689,7 +689,7 @@ public class DatagramReceiver extends Handler { 


    /** Report incoming datagram related metrics */

    private void reportMetrics(@Nullable SatelliteDatagram satelliteDatagram,

            @NonNull @SatelliteManager.SatelliteError int resultCode) {

            @NonNull @SatelliteManager.SatelliteResult int resultCode) {

        int datagramSizeRoundedBytes = -1;

        int datagramTransferTime = 0;
@@ -767,7 +767,7 @@ public class DatagramReceiver extends Handler { 
    private void handleEventSatelliteAlignedTimeout(DatagramReceiverHandlerRequest request) {

        SatelliteManager.SatelliteException exception =

                new SatelliteManager.SatelliteException(

                        SatelliteManager.SATELLITE_NOT_REACHABLE);

                        SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);

        Message message = obtainMessage(EVENT_POLL_PENDING_SATELLITE_DATAGRAMS_DONE, request);

        AsyncResult.forMessage(message, null, exception);

        message.sendToTarget();

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

+5 −5

File changed.

Preview size limit exceeded, changes collapsed.