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

Commit 3a408ad4 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Add direct report back when registerForNtnSignalStrength is invoked" into main

parents 76fc27b9 74abda9f

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

+9 −0
Original line number Diff line number Diff line
@@ -2448,6 +2448,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
@@ -2446,6 +2446,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);