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

Commit 6dc32639 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi
Browse files

Add logging for onFilterComplete timeout 

Bug: 120708987
Test: Sanity
Change-Id: I426f1725e907a587c3bbe49a9ab833fb9b12f271
Merged-In: I426f1725e907a587c3bbe49a9ab833fb9b12f271
parent a147619a

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

+8 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.service.carrier.ICarrierMessagingService; 
import android.service.carrier.MessagePdu;

import android.telephony.CarrierMessagingServiceManager;

import android.telephony.Rlog;

import android.util.LocalLog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.uicc.UiccCard;
@@ -62,9 +63,9 @@ public class CarrierServicesSmsFilter { 
    private final CarrierServicesSmsFilterCallbackInterface mCarrierServicesSmsFilterCallback;

    private final String mLogTag;

    private final CallbackTimeoutHandler mCallbackTimeoutHandler;

    private final LocalLog mLocalLog;

    private FilterAggregator mFilterAggregator;





    @VisibleForTesting

    public CarrierServicesSmsFilter(

            Context context,
@@ -73,7 +74,8 @@ public class CarrierServicesSmsFilter { 
            int destPort,

            String pduFormat,

            CarrierServicesSmsFilterCallbackInterface carrierServicesSmsFilterCallback,

            String logTag) {

            String logTag,

            LocalLog localLog) {

        mContext = context;

        mPhone = phone;

        mPdus = pdus;
@@ -82,6 +84,7 @@ public class CarrierServicesSmsFilter { 
        mCarrierServicesSmsFilterCallback = carrierServicesSmsFilterCallback;

        mLogTag = logTag;

        mCallbackTimeoutHandler = new CallbackTimeoutHandler();

        mLocalLog = localLog;

    }



    /**
@@ -325,6 +328,7 @@ public class CarrierServicesSmsFilter { 
                    }

                    //all onFilterCompletes called before timeout has triggered

                    //remove the pending message

                    log("onFilterComplete called successfully with result = " + result);

                    mCallbackTimeoutHandler.removeMessages(EVENT_ON_FILTER_COMPLETE_NOT_CALLED);

                }

            }
@@ -352,6 +356,8 @@ public class CarrierServicesSmsFilter { 


            switch(msg.what) {

                case EVENT_ON_FILTER_COMPLETE_NOT_CALLED:

                    mLocalLog.log("CarrierServicesSmsFilter: onFilterComplete timeout: not"

                            + " called before " + FILTER_COMPLETE_TIMEOUT_MS + " milliseconds.");

                    handleFilterCallbacksTimeout();

                    break;

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,8 @@ public abstract class InboundSmsHandler extends StateMachine { 
                new CarrierServicesSmsFilterCallback(

                        pdus, destPort, tracker.getFormat(), resultReceiver, userUnlocked);

        CarrierServicesSmsFilter carrierServicesFilter = new CarrierServicesSmsFilter(

                mContext, mPhone, pdus, destPort, tracker.getFormat(), filterCallback, getName());

                mContext, mPhone, pdus, destPort, tracker.getFormat(),

                filterCallback, getName(), mLocalLog);

        if (carrierServicesFilter.filter()) {

            return true;

        }

tests/telephonytests/src/com/android/internal/telephony/CarrierServicesSmsFilterTest.java

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.service.carrier.ICarrierMessagingCallback; 
import android.service.carrier.ICarrierMessagingService;

import android.service.carrier.MessagePdu;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.LocalLog;



import com.android.internal.telephony.uicc.UiccCard;
@@ -79,7 +80,7 @@ public class CarrierServicesSmsFilterTest extends TelephonyTest { 
        }

        mCarrierServicesSmsFilterUT = new CarrierServicesSmsFilter(

                mContext, mPhone, new byte[][]{SMS_PDU},

                0, "3gpp", mFilterCallback, getClass().getSimpleName()

                0, "3gpp", mFilterCallback, getClass().getSimpleName(), new LocalLog(64)

        );

    }