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

Commit 0f9aac34 authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

Don't check provisioned condition for register APIs 

Flag: EXEMPT bugfix
Bug: 365849187
Test: SatelliteControllerTest SatelliteManagerTest
Manually tested Skylo demo mode

Change-Id: I3e9e551e9d80cdc3f8c3cf896a0f244de90db19b
parent 6966f43b

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

+4 −18
Original line number Diff line number Diff line
@@ -2264,12 +2264,6 @@ public class SatelliteController extends Handler { 
    public void stopSatelliteTransmissionUpdates(@NonNull IIntegerConsumer errorCallback,

            @NonNull ISatelliteTransmissionUpdateCallback callback) {

        Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(errorCallback::accept);

        int error = evaluateOemSatelliteRequestAllowed(true);

        if (error != SATELLITE_RESULT_SUCCESS) {

            result.accept(error);

            return;

        }



        mPointingAppController.unregisterForSatelliteTransmissionUpdates(

                getHighestPrioritySubscrption(), result, callback);
@@ -2773,7 +2767,7 @@ public class SatelliteController extends Handler { 
            @NonNull INtnSignalStrengthCallback callback) throws RemoteException {

        if (DBG) plogd("registerForNtnSignalStrengthChanged()");



        int error = evaluateOemSatelliteRequestAllowed(true);

        int error = evaluateOemSatelliteRequestAllowed(false);

        if (error == SATELLITE_RESULT_SUCCESS) {

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

            synchronized (mNtnSignalsStrengthLock) {
@@ -2801,12 +2795,8 @@ public class SatelliteController extends Handler { 
    public void unregisterForNtnSignalStrengthChanged(

            @NonNull INtnSignalStrengthCallback callback) {

        if (DBG) plogd("unregisterForNtnSignalStrengthChanged()");



        int error = evaluateOemSatelliteRequestAllowed(true);

        if (error == SATELLITE_RESULT_SUCCESS) {

        mNtnSignalStrengthChangedListeners.remove(callback.asBinder());

    }

    }



    /**

     * Registers for satellite capabilities change event from the satellite service.
@@ -2819,7 +2809,7 @@ public class SatelliteController extends Handler { 
            @NonNull ISatelliteCapabilitiesCallback callback) {

        if (DBG) plogd("registerForCapabilitiesChanged()");



        int error = evaluateOemSatelliteRequestAllowed(true);

        int error = evaluateOemSatelliteRequestAllowed(false);

        if (error != SATELLITE_RESULT_SUCCESS) return error;



        mSatelliteCapabilitiesChangedListeners.put(callback.asBinder(), callback);
@@ -2837,12 +2827,8 @@ public class SatelliteController extends Handler { 
    public void unregisterForCapabilitiesChanged(

            @NonNull ISatelliteCapabilitiesCallback callback) {

        if (DBG) plogd("unregisterForCapabilitiesChanged()");



        int error = evaluateOemSatelliteRequestAllowed(true);

        if (error == SATELLITE_RESULT_SUCCESS) {

        mSatelliteCapabilitiesChangedListeners.remove(callback.asBinder());

    }

    }



    /**

     * Registers for the satellite supported state changed.

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

+4 −43
Original line number Diff line number Diff line
@@ -1471,49 +1471,6 @@ public class SatelliteControllerTest extends TelephonyTest { 


    @Test

    public void testStopSatelliteTransmissionUpdates() {

        mIIntegerConsumerSemaphore.drainPermits();

        mIIntegerConsumerResults.clear();

        mSatelliteControllerUT.stopSatelliteTransmissionUpdates(mIIntegerConsumer,

                mStopTransmissionUpdateCallback);

        processAllMessages();

        assertTrue(waitForIIntegerConsumerResult(1));

        assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,

                (long) mIIntegerConsumerResults.get(0));



        mIIntegerConsumerResults.clear();

        setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);

        verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);

        mSatelliteControllerUT.stopSatelliteTransmissionUpdates(mIIntegerConsumer,

                mStopTransmissionUpdateCallback);

        processAllMessages();

        assertTrue(waitForIIntegerConsumerResult(1));

        assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));



        resetSatelliteControllerUT();

        mIIntegerConsumerResults.clear();

        setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        mSatelliteControllerUT.stopSatelliteTransmissionUpdates(mIIntegerConsumer,

                mStopTransmissionUpdateCallback);

        processAllMessages();

        assertTrue(waitForIIntegerConsumerResult(1));

        assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,

                (long) mIIntegerConsumerResults.get(0));



        resetSatelliteControllerUT();

        mIIntegerConsumerResults.clear();

        setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);

        verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);

        setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_RESULT_SUCCESS);

        mSatelliteControllerUT.stopSatelliteTransmissionUpdates(mIIntegerConsumer,

                mStopTransmissionUpdateCallback);

        processAllMessages();

        assertTrue(waitForIIntegerConsumerResult(1));

        assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,

                (long) mIIntegerConsumerResults.get(0));



        resetSatelliteControllerUT();

        mIIntegerConsumerResults.clear();

        provisionSatelliteService();
@@ -1533,7 +1490,11 @@ public class SatelliteControllerTest extends TelephonyTest { 
        setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_RESULT_INVALID_TELEPHONY_STATE);

        mSatelliteControllerUT.stopSatelliteTransmissionUpdates(mIIntegerConsumer,

                mStopTransmissionUpdateCallback);

        verify(mMockPointingAppController, times(2)).unregisterForSatelliteTransmissionUpdates(

                anyInt(), any(), eq(mStopTransmissionUpdateCallback));

        processAllMessages();

        verify(mMockPointingAppController, times(2)).stopSatelliteTransmissionUpdates(

                any(Message.class));

        assertTrue(waitForIIntegerConsumerResult(1));

        assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,

                (long) mIIntegerConsumerResults.get(0));