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

Commit f503a92f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect failure cause for RIL_REQUEST_SMS_ACKNOWLEDGE" am: 18c3831f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1359244

Change-Id: If5db9c6eecdc069803d2b5fc780c98ae821f63f6
parents 53cad68e 18c3831f

src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.internal.telephony.SmsResponse.NO_ERROR_CODE; 
import android.compat.annotation.UnsupportedAppUsage;

import android.os.AsyncResult;

import android.os.Message;

import android.provider.Telephony.Sms.Intents;

import android.telephony.ServiceState;

import android.util.Pair;
@@ -165,7 +164,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { 
                        messageRef, getFormat(), pdu);

            }

        }

        mCi.acknowledgeLastIncomingGsmSms(true, Intents.RESULT_SMS_HANDLED, null);

        mCi.acknowledgeLastIncomingGsmSms(true, 0 /* cause */, null);

    }



    /** {@inheritDoc} */

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

+1 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.os.HandlerThread; 
import android.os.Message;

import android.os.SystemProperties;

import android.provider.Settings;

import android.provider.Telephony;

import android.telephony.SmsManager;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;
@@ -143,8 +142,7 @@ public class GsmSmsDispatcherTest extends TelephonyTest { 
    public void testSmsStatus() {

        mSimulatedCommands.notifySmsStatus(new byte[]{(byte)0xFF, (byte)0xFF, (byte)0xFF});

        TelephonyTestUtils.waitForMs(50);

        verify(mSimulatedCommandsVerifier).acknowledgeLastIncomingGsmSms(true,

                Telephony.Sms.Intents.RESULT_SMS_HANDLED, null);

        verify(mSimulatedCommandsVerifier).acknowledgeLastIncomingGsmSms(true, 0, null);

    }



    @Test @MediumTest