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

Commit f9c83775 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13450015 from 981fc3de to 25Q3-release 

Change-Id: I1d8f482b305da880c88e976fbb475a5fc69ae0a7
parents 26884da9 981fc3de

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

+32 −35
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ public class DatagramDispatcher extends Handler { 
                argument.setDatagramStartTime();

                onCompleted = obtainMessage(EVENT_SEND_SATELLITE_DATAGRAM_DONE, request);



                synchronized (mLock) {

                if (mIsDemoMode.get() && !shouldSendDatagramToModemInDemoMode()) {

                    AsyncResult.forMessage(onCompleted, SATELLITE_RESULT_SUCCESS, null);

                    sendMessageDelayed(onCompleted, getDemoTimeoutDuration());
@@ -279,7 +278,6 @@ public class DatagramDispatcher extends Handler { 
                            argument.needFullScreenPointingUI, onCompleted);

                    startWaitForDatagramSendingResponseTimer(argument);

                }

                }

                break;

            }

            case EVENT_SEND_SATELLITE_DATAGRAM_DONE: {
@@ -837,7 +835,6 @@ public class DatagramDispatcher extends Handler { 
    private void handleEventSatelliteModemStateChanged(

            @SatelliteManager.SatelliteModemState int state) {

        plogd("handleEventSatelliteModemStateChanged: state = " + state);

        synchronized (mLock) {

        mModemState.set(state);

        if (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF

                || state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE) {
@@ -867,7 +864,7 @@ public class DatagramDispatcher extends Handler { 
                mShouldPollMtSms.set(shouldPollMtSms());

            }

        }

        }



        if (allowMtSmsPolling()) {

            sendMessage(obtainMessage(CMD_SEND_MT_SMS_POLLING_MESSAGE));

        }

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

+131 −159

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+5 −2
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ import java.util.Map; 
import java.util.Optional;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.Executor;

import java.util.concurrent.Semaphore;
@@ -2932,7 +2933,8 @@ public class SatelliteControllerTest extends TelephonyTest { 
        reset(mMockSatelliteModemInterface);

        setUpResponseForRequestSetSatelliteEnabledForCarrier(true, SATELLITE_RESULT_SUCCESS);

        doReturn(true).when(mMockSatelliteModemInterface).isSatelliteServiceSupported();

        Map<Integer, Set<Integer>> satelliteAttachRestrictionForCarrierArray = new HashMap<>();

        ConcurrentHashMap<Integer, Set<Integer>> satelliteAttachRestrictionForCarrierArray =

                new ConcurrentHashMap<>();

        satelliteAttachRestrictionForCarrierArray.put(SUB_ID, new HashSet<>());

        satelliteAttachRestrictionForCarrierArray.get(SUB_ID).add(

                SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
@@ -2956,7 +2958,8 @@ public class SatelliteControllerTest extends TelephonyTest { 
        mIIntegerConsumerResults.clear();

        reset(mMockSatelliteModemInterface);

        reset(mPhone);

        Map<Integer, Boolean> enabledForCarrierArrayPerSub = new HashMap<>();

        ConcurrentHashMap<Integer, Boolean> enabledForCarrierArrayPerSub =

                new ConcurrentHashMap<>();

        enabledForCarrierArrayPerSub.put(SUB_ID, true);

        replaceInstance(SatelliteController.class, "mIsSatelliteAttachEnabledForCarrierArrayPerSub",

                mSatelliteControllerUT, enabledForCarrierArrayPerSub);