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

Commit 0d46207f authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future 

Bug: 347831320
Merged-In: I552ee1778fe7b324118e61ea465a9c46f4528468
Change-Id: I0ecf3620e86c0b7d6f48f1a6316dba7ccc5bbff9
parents fef30c21 fd916079

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));

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ public class SatelliteSOSMessageRecommender extends Handler { 
            intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP);

        }

        Bundle activityOptions = ActivityOptions.makeBasic()

                .setPendingIntentBackgroundActivityStartMode(

                .setPendingIntentCreatorBackgroundActivityStartMode(

                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                .toBundle();

        intent.setComponent(new ComponentName(packageName, className));

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);