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

Commit 2b5b96a4 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Send request immediately to handler

The following methods are updated in this cl:
- provisionSatellite
- deprovisionSatellite

Bug: 409584433
Test: atest
Flag: com.android.internal.telephony.flags.satellite_improve_multi_thread_design
Change-Id: I9eeaacd8387cd1d660f0c1e3470a9999aa4e7a3d
parent 9d671480
Loading
Loading
Loading
Loading
+52 −0
Original line number Diff line number Diff line
@@ -344,6 +344,8 @@ public class SatelliteController extends Handler {
    private static final int REQUEST_NTN_SIGNAL_STRENGTH = 83;
    private static final int REQUEST_SATELLITE_SUBSCRIBER_PROVISION_STATUS = 84;
    private static final int REQUEST_SET_NTN_SMS_SUPPORTED_BY_MESSAGES_APP = 85;
    private static final int REQUEST_PROVISION_SATELLITE = 86;
    private static final int REQUEST_DEPROVISION_SATELLITE = 87;

    @NonNull private static SatelliteController sInstance;
    @NonNull private final Context mContext;
@@ -2597,6 +2599,32 @@ public class SatelliteController extends Handler {
                break;
            }

            case REQUEST_PROVISION_SATELLITE: {
                plogd("REQUEST_PROVISION_SATELLITE");
                SomeArgs args = (SomeArgs) msg.obj;
                List<SatelliteSubscriberInfo> list = (List<SatelliteSubscriberInfo>) args.arg1;
                ResultReceiver result = (ResultReceiver) args.arg2;
                try {
                    handleRequestProvisionSatellite(list, result);
                } finally {
                    args.recycle();
                }
                break;
            }

            case REQUEST_DEPROVISION_SATELLITE: {
                plogd("REQUEST_DEPROVISION_SATELLITE");
                SomeArgs args = (SomeArgs) msg.obj;
                List<SatelliteSubscriberInfo> list = (List<SatelliteSubscriberInfo>) args.arg1;
                ResultReceiver result = (ResultReceiver) args.arg2;
                try {
                    handleRequestDeprovisionSatellite(list, result);
                } finally {
                    args.recycle();
                }
                break;
            }

            default:
                Log.w(TAG, "SatelliteControllerHandler: unexpected message code: " +
                        msg.what);
@@ -8561,6 +8589,18 @@ public class SatelliteController extends Handler {
     */
    public void provisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,
            @NonNull ResultReceiver result) {
        if (mFeatureFlags.satelliteImproveMultiThreadDesign()) {
            SomeArgs args = SomeArgs.obtain();
            args.arg1 = list;
            args.arg2 = result;
            sendMessage(obtainMessage(REQUEST_PROVISION_SATELLITE, args));
        }

        handleRequestProvisionSatellite(list, result);
    }

    private void handleRequestProvisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,
            @NonNull ResultReceiver result) {
        if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
            result.send(SATELLITE_RESULT_REQUEST_NOT_SUPPORTED, null);
            logd("provisionSatellite: carrierRoamingNbIotNtn not support");
@@ -8645,6 +8685,18 @@ public class SatelliteController extends Handler {
     */
    public void deprovisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,
            @NonNull ResultReceiver result) {
        if (mFeatureFlags.satelliteImproveMultiThreadDesign()) {
            SomeArgs args = SomeArgs.obtain();
            args.arg1 = list;
            args.arg2 = result;
            sendMessage(obtainMessage(REQUEST_DEPROVISION_SATELLITE, args));
        }

        handleRequestDeprovisionSatellite(list, result);
    }

    private void handleRequestDeprovisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,
            @NonNull ResultReceiver result) {
        if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
            result.send(SATELLITE_RESULT_REQUEST_NOT_SUPPORTED, null);
            logd("deprovisionSatellite: carrierRoamingNbIotNtn not support");
+3 −3
Original line number Diff line number Diff line
@@ -4470,7 +4470,7 @@ public class SatelliteControllerTest extends TelephonyTest {
        inputList.add(list.get(0));
        verifyProvisionSatellite(inputList);

        verify(mMockSatelliteModemInterface, times(1)).updateSatelliteSubscription(anyString(),
        verify(mMockSatelliteModemInterface, times(2)).updateSatelliteSubscription(anyString(),
                any());
        assertTrue(waitForForEvents(
                semaphore, 1, "testRegisterForSatelliteSubscriptionProvisionStateChanged"));
@@ -4841,8 +4841,8 @@ public class SatelliteControllerTest extends TelephonyTest {

        List<SatelliteSubscriberInfo> inputList = getExpectedSatelliteSubscriberInfoList();
        verifyProvisionSatellite(inputList);
        verify(mMockSubscriptionManagerService).setIsSatelliteProvisionedForNonIpDatagram(
                eq(SUB_ID), eq(true));
        verify(mMockSubscriptionManagerService, times(2))
                .setIsSatelliteProvisionedForNonIpDatagram(eq(SUB_ID), eq(true));
    }

    @Test