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

Commit f3fe3bcf authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "requestIsDemoModeEnabled - send request to handler immediately" into main

parents 6faa6e69 8c4ff9fd

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

+25 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ public class SatelliteController extends Handler { 
    private static final int EVENT_GET_SATELLITE_ENABLED_FOR_CARRIER_DONE = 65;

    private static final int REQUEST_SATELLITE_ENABLED = 66;

    private static final int REQUEST_IS_SATELLITE_ENABLED = 67;

    private static final int REQUEST_IS_DEMO_MODE_ENABLED = 68;



    @NonNull private static SatelliteController sInstance;

    @NonNull private final Context mContext;
@@ -2350,6 +2351,18 @@ public class SatelliteController extends Handler { 
                break;

            }



            case REQUEST_IS_DEMO_MODE_ENABLED: {

                plogd("REQUEST_IS_DEMO_MODE_ENABLED");

                SomeArgs args = (SomeArgs) msg.obj;

                ResultReceiver result = (ResultReceiver) args.arg1;

                try {

                    handleRequestIsDemoModeEnabled(result);

                } finally {

                    args.recycle();

                }

                break;

            }



            default:

                Log.w(TAG, "SatelliteControllerHandler: unexpected message code: " +

                        msg.what);
@@ -2826,6 +2839,18 @@ public class SatelliteController extends Handler { 
     *               if the request is successful or an error code if the request failed.

     */

    public void requestIsDemoModeEnabled(@NonNull ResultReceiver result) {

        if (mFeatureFlags.satelliteImproveMultiThreadDesign()) {

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = result;

            sendMessage(obtainMessage(REQUEST_IS_DEMO_MODE_ENABLED, args));

            return;

        }



        handleRequestIsDemoModeEnabled(result);

    }



    private void handleRequestIsDemoModeEnabled(@NonNull ResultReceiver result) {

        plogd("handleRequestIsDemoModeEnabled");

        int error = evaluateOemSatelliteRequestAllowed(true);

        if (error != SATELLITE_RESULT_SUCCESS) {

            result.send(error, null);

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

+5 −0
Original line number Diff line number Diff line
@@ -1597,6 +1597,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        mIsDemoModeEnabledSemaphore.drainPermits();

        resetSatelliteControllerUT();

        mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);

        processAllMessages();

        assertTrue(waitForRequestIsDemoModeEnabledResult(1));

        assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mQueriedIsDemoModeEnabledResultCode);

        assertFalse(mQueriedIsDemoModeEnabled);
@@ -1605,6 +1606,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);

        verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);

        mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);

        processAllMessages();

        assertTrue(waitForRequestIsDemoModeEnabledResult(1));

        assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedIsDemoModeEnabledResultCode);

        assertFalse(mQueriedIsDemoModeEnabled);
@@ -1613,6 +1615,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);

        processAllMessages();

        assertTrue(waitForRequestIsDemoModeEnabledResult(1));

        assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, mQueriedIsDemoModeEnabledResultCode);

        assertFalse(mQueriedIsDemoModeEnabled);
@@ -1623,6 +1626,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);

        verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);

        mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);

        processAllMessages();

        assertTrue(waitForRequestIsDemoModeEnabledResult(1));

        assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, mQueriedIsDemoModeEnabledResultCode);

        assertFalse(mQueriedIsDemoModeEnabled);
@@ -1631,6 +1635,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        boolean isDemoModeEnabled = mSatelliteControllerUT.isDemoModeEnabled();

        provisionSatelliteService();

        mSatelliteControllerUT.requestIsDemoModeEnabled(mIsDemoModeEnabledReceiver);

        processAllMessages();

        assertTrue(waitForRequestIsDemoModeEnabledResult(1));

        assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedIsDemoModeEnabledResultCode);

        assertEquals(isDemoModeEnabled, mQueriedIsDemoModeEnabled);