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

Commit 766f3807 authored by Jesse Melhuish's avatar Jesse Melhuish
Browse files

Clean up temporary_failures_in_carrier_messaging_service 

Bug: 357638490
Test: atest GsmSmsDispatcherTest
Flag: EXEMPT flag clean up
Change-Id: Ica220b5037bfce017d728854d7d985e92d776e30
parent 2e8d6236

src/java/com/android/internal/telephony/SMSDispatcher.java

+3 −9
Original line number Diff line number Diff line
@@ -833,9 +833,7 @@ public abstract class SMSDispatcher extends Handler { 


        SmsResponse smsResponse = new SmsResponse(messageRef, null /* ackPdu */, NO_ERROR_CODE,

                tracker.mMessageId);

        if (Flags.temporaryFailuresInCarrierMessagingService()) {

        tracker.mResultCodeFromCarrierMessagingService = result;

        }



        switch (result) {

            case CarrierMessagingService.SEND_STATUS_OK:
@@ -900,10 +898,7 @@ public abstract class SMSDispatcher extends Handler { 
    }



    private void resetResultCodeFromCarrierMessagingService(SmsTracker tracker) {

        if (Flags.temporaryFailuresInCarrierMessagingService()) {

            tracker.mResultCodeFromCarrierMessagingService =

                    CarrierMessagingService.SEND_STATUS_OK;

        }

        tracker.mResultCodeFromCarrierMessagingService = CarrierMessagingService.SEND_STATUS_OK;

    }



    private int toSmsManagerResultForSendSms(int carrierMessagingServiceResult) {
@@ -1162,8 +1157,7 @@ public abstract class SMSDispatcher extends Handler { 
            }



            int error;

            if (Flags.temporaryFailuresInCarrierMessagingService()

                    && tracker.mResultCodeFromCarrierMessagingService

            if (tracker.mResultCodeFromCarrierMessagingService

                            != CarrierMessagingService.SEND_STATUS_OK) {

                error =

                        toSmsManagerResultForSendSms(

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java

+0 −5
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ import com.android.internal.telephony.SmsResponse; 
import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.TelephonyTestUtils;

import com.android.internal.telephony.TestApplication;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.satellite.SatelliteController;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.IsimUiccRecords;
@@ -473,10 +472,6 @@ public class GsmSmsDispatcherTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testSendSmsByCarrierApp_FailureWithReason() throws Exception {

        if (!Flags.temporaryFailuresInCarrierMessagingService()) {

            return;

        }

        doReturn(true).when(mFeatureFlags).temporaryFailuresInCarrierMessagingService();

        int resultCode =

                sendSmsWithCarrierAppResponse(

                        CarrierMessagingService.SEND_STATUS_RESULT_ERROR_NO_SERVICE);