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

Commit af498a04 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Use InboundSmsTracker#getFormat() to get message format simply" into qt-dev-plus-aosp

parents 162d0a1c 7d6e3639

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

+2 −2
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ public abstract class InboundSmsHandler extends StateMachine { 


        // At this point, all parts of the SMS are received. Update metrics for incoming SMS.

        // WAP-PUSH messages are handled below to also keep track of the result of the processing.

        String format = (!tracker.is3gpp2() ? SmsConstants.FORMAT_3GPP : SmsConstants.FORMAT_3GPP2);

        String format = tracker.getFormat();

        if (!isWapPush) {

            mMetrics.writeIncomingSmsSession(mPhone.getPhoneId(), mLastSmsWasInjected,

                    format, timestamps, block);
@@ -997,7 +997,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
            pdus, destPort, tracker, resultReceiver, true /* userUnlocked */);



        if (!filterInvoked) {

            dispatchSmsDeliveryIntent(pdus, tracker.getFormat(), destPort, resultReceiver,

            dispatchSmsDeliveryIntent(pdus, format, destPort, resultReceiver,

                    tracker.isClass0());

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.internal.telephony.FakeSmsContentProvider; 
import com.android.internal.telephony.InboundSmsHandler;

import com.android.internal.telephony.InboundSmsTracker;

import com.android.internal.telephony.SmsBroadcastUndelivered;

import com.android.internal.telephony.SmsConstants;

import com.android.internal.telephony.SmsHeader;

import com.android.internal.telephony.SmsStorageMonitor;

import com.android.internal.telephony.TelephonyTest;
@@ -157,6 +158,7 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
        doReturn(mMessageBody).when(mMockInboundSmsTracker).getMessageBody();

        doReturn(mSmsPdu).when(mMockInboundSmsTracker).getPdu();

        doReturn(mInboundSmsTrackerCV.get("date")).when(mMockInboundSmsTracker).getTimestamp();

        doReturn(SmsConstants.FORMAT_3GPP).when(mMockInboundSmsTracker).getFormat();

        doReturn(mInboundSmsTrackerCV).when(mMockInboundSmsTracker).getContentValues();



        doReturn(mMockInboundSmsTracker).when(mTelephonyComponentFactory)