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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28479567'] into 24Q3-release. 

Change-Id: I62efee08c522e6ddabff47e075f7b249926a654f
parents 585f1a81 6f099e94

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

+9 −0
Original line number Diff line number Diff line
@@ -2269,6 +2269,15 @@ public class SatelliteController extends Handler { 
        int error = evaluateOemSatelliteRequestAllowed(true);

        if (error == SATELLITE_RESULT_SUCCESS) {

            mNtnSignalStrengthChangedListeners.put(callback.asBinder(), callback);

            synchronized (mNtnSignalsStrengthLock) {

                try {

                    callback.onNtnSignalStrengthChanged(mNtnSignalStrength);

                    plogd("registerForNtnSignalStrengthChanged: " + mNtnSignalStrength);

                } catch (RemoteException ex) {

                    ploge("registerForNtnSignalStrengthChanged: RemoteException ex="

                            + ex);

                }

            }

        } else {

            throw new RemoteException(new IllegalStateException("registration fails: " + error));

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -2389,6 +2389,10 @@ public class SatelliteControllerTest extends TelephonyTest { 
        verifyRegisterForNtnSignalStrengthChanged(SUB_ID, callback,

                SATELLITE_RESULT_SUCCESS);

        verifyRequestNtnSignalStrength(expectedLevel, SATELLITE_RESULT_SUCCESS);

        processAllMessages();

        assertTrue(waitForForEvents(

                semaphore, 1, "testRegisterForNtnSignalStrengthChanged"));

        assertEquals(expectedLevel, signalStrength[0].getLevel());



        expectedLevel = NTN_SIGNAL_STRENGTH_GOOD;

        sendNtnSignalStrengthChangedEvent(expectedLevel, null);