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

Commit 6688de78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Satellite] fixed override datagram value reading in missed scenarios" into main

parents a8a50739 82f7f565

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

+4 −4
Original line number Diff line number Diff line
@@ -2449,6 +2449,7 @@ public class SatelliteController extends Handler { 
        synchronized (mSatelliteCapabilitiesLock) {

            if (mSatelliteCapabilities != null) {

                Bundle bundle = new Bundle();

                overrideSatelliteCapabilitiesIfApplicable();

                bundle.putParcelable(SatelliteManager.KEY_SATELLITE_CAPABILITIES,

                        mSatelliteCapabilities);

                result.send(SATELLITE_RESULT_SUCCESS, bundle);
@@ -4588,13 +4589,11 @@ public class SatelliteController extends Handler { 


        synchronized (mSatelliteCapabilitiesLock) {

            mSatelliteCapabilities = capabilities;

            overrideSatelliteCapabilitiesIfApplicable();

        }



        List<ISatelliteCapabilitiesCallback> deadCallersList = new ArrayList<>();

        mSatelliteCapabilitiesChangedListeners.values().forEach(listener -> {

            synchronized (this.mSatelliteCapabilitiesLock) {

                overrideSatelliteCapabilitiesIfApplicable();

            }

            try {

                listener.onSatelliteCapabilitiesChanged(this.mSatelliteCapabilities);

            } catch (RemoteException e) {
@@ -5068,7 +5067,8 @@ public class SatelliteController extends Handler { 
                        KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT,

                        KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT

                        KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE

                );

            } catch (Exception e) {

                logw("getConfigForSubId: " + e);

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

+1 −0
Original line number Diff line number Diff line
@@ -2553,6 +2553,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        assertTrue(

                mQueriedSatelliteCapabilities.getSupportedRadioTechnologies().contains(

                        satelliteController.getSupportedNtnRadioTechnology()));

        assertEquals(mQueriedSatelliteCapabilities.getMaxBytesPerOutgoingDatagram(), 255);

        assertTrue(satelliteController.isSatelliteAttachRequired());



        when(mFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(false);