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

Commit be98a8ad authored by Pengquan Meng's avatar Pengquan Meng Committed by Jack Yu
Browse files

Improved log for InboundSmsHandler 

We got a lot of bugs about can't receive the SMS, but the log sometime
is incomplete, which made the debug become hard. We need to add some
useful log to LocalLog so that we can keep the debug log longer.

Test: manual test
Bug: 78538843
Merged-In: Ia33ff3c4c601ae8a0f04a658fd6f7cf6ff3bc2a9
Change-Id: Ia33ff3c4c601ae8a0f04a658fd6f7cf6ff3bc2a9
(cherry picked from commit 0a3bdd0d)
parent f3fa9930

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

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ import com.android.internal.telephony.uicc.IccFileHandler; 
import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.util.HexDump;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;
@@ -1335,4 +1337,7 @@ public class IccSmsInterfaceManager { 
        return result != null ? result : destAddr;

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mDispatchersController.dump(fd, pw, args);

    }

}

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

+45 −2
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.telephony.SmsMessage; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.LocalLog;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;
@@ -69,6 +70,8 @@ import com.android.internal.util.State; 
import com.android.internal.util.StateMachine;



import java.io.ByteArrayOutputStream;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;
@@ -157,6 +160,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
    /** New SMS received as an AsyncResult. */

    public static final int EVENT_INJECT_SMS = 8;



    /** Update the sms tracker */

    public static final int EVENT_UPDATE_TRACKER = 9;



    /** Wakelock release delay when returning to idle state. */

    private static final int WAKELOCK_TIMEOUT = 3000;
@@ -205,6 +211,8 @@ public abstract class InboundSmsHandler extends StateMachine { 


    private UserManager mUserManager;



    private LocalLog mLocalLog = new LocalLog(64);



    IDeviceIdleController mDeviceIdleController;



    // Delete permanently from raw table
@@ -449,6 +457,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                    // if any broadcasts were sent, transition to waiting state

                    InboundSmsTracker inboundSmsTracker = (InboundSmsTracker) msg.obj;

                    if (processMessagePart(inboundSmsTracker)) {

                        sendMessage(obtainMessage(EVENT_UPDATE_TRACKER, msg.obj));

                        transitionTo(mWaitingState);

                    } else {

                        // if event is sent from SmsBroadcastUndelivered.broadcastSms(), and
@@ -474,10 +483,17 @@ public abstract class InboundSmsHandler extends StateMachine { 
                    }

                    return HANDLED;



                case EVENT_UPDATE_TRACKER:

                    logd("process tracker message in DeliveringState " + msg.arg1);

                    return HANDLED;



                // we shouldn't get this message type in this state, log error and halt.

                case EVENT_BROADCAST_COMPLETE:

                case EVENT_START_ACCEPTING_SMS:

                default:

                    String errorMsg = "Unhandled msg in delivering state, msg.what = " + msg.what;

                    loge(errorMsg);

                    mLocalLog.log(errorMsg);

                    // let DefaultState handle these unexpected message types

                    return NOT_HANDLED;

            }
@@ -493,6 +509,8 @@ public abstract class InboundSmsHandler extends StateMachine { 
     */

    private class WaitingState extends State {



        private InboundSmsTracker mLastDeliveredSmsTracker;



        @Override

        public void enter() {

            if (DBG) log("entering Waiting state");
@@ -512,10 +530,20 @@ public abstract class InboundSmsHandler extends StateMachine { 
            switch (msg.what) {

                case EVENT_BROADCAST_SMS:

                    // defer until the current broadcast completes

                    if (mLastDeliveredSmsTracker != null) {

                        String str = "Defer sms broadcast due to undelivered sms, "

                                + " messageCount = " + mLastDeliveredSmsTracker.getMessageCount()

                                + " destPort = " + mLastDeliveredSmsTracker.getDestPort()

                                + " timestamp = " + mLastDeliveredSmsTracker.getTimestamp()

                                + " currentTimestamp = " + System.currentTimeMillis();

                        logd(str);

                        mLocalLog.log(str);

                    }

                    deferMessage(msg);

                    return HANDLED;



                case EVENT_BROADCAST_COMPLETE:

                    mLastDeliveredSmsTracker = null;

                    // return to idle after handling all deferred messages

                    sendMessage(EVENT_RETURN_TO_IDLE);

                    transitionTo(mDeliveringState);
@@ -525,6 +553,13 @@ public abstract class InboundSmsHandler extends StateMachine { 
                    // not ready to return to idle; ignore

                    return HANDLED;



                case EVENT_UPDATE_TRACKER:

                    for (int i = 1; i < 10; i++) {

                        deferMessage(obtainMessage(EVENT_UPDATE_TRACKER, i, i, msg.obj));

                    }

                    mLastDeliveredSmsTracker = (InboundSmsTracker) msg.obj;

                    return HANDLED;



                default:

                    // parent state handles the other message types

                    return NOT_HANDLED;
@@ -835,8 +870,10 @@ public abstract class InboundSmsHandler extends StateMachine { 
        // Do not process null pdu(s). Check for that and return false in that case.

        List<byte[]> pduList = Arrays.asList(pdus);

        if (pduList.size() == 0 || pduList.contains(null)) {

            loge("processMessagePart: returning false due to " +

                    (pduList.size() == 0 ? "pduList.size() == 0" : "pduList.contains(null)"));

            String errorMsg = "processMessagePart: returning false due to "

                    + (pduList.size() == 0 ? "pduList.size() == 0" : "pduList.contains(null)");

            loge(errorMsg);

            mLocalLog.log(errorMsg);

            return false;

        }
@@ -1529,6 +1566,12 @@ public abstract class InboundSmsHandler extends StateMachine { 
        }

    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        super.dump(fd, pw, args);

        mLocalLog.dump(fd, pw, args);

    }



    // Some providers send formfeeds in their messages. Convert those formfeeds to newlines.

    private static String replaceFormFeeds(String s) {

        return s == null ? "" : s.replace('\f', '\n');

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

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ import com.android.internal.telephony.cdma.CdmaSMSDispatcher; 
import com.android.internal.telephony.gsm.GsmInboundSmsHandler;

import com.android.internal.telephony.gsm.GsmSMSDispatcher;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashMap;
@@ -627,4 +629,9 @@ public class SmsDispatchersController extends Handler { 
    public interface SmsInjectionCallback {

        void onSmsInjectedResult(int result);

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mGsmInboundSmsHandler.dump(fd, pw, args);

        mCdmaInboundSmsHandler.dump(fd, pw, args);

    }

}

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

+21 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.internal.util.IndentingPrintWriter;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.List;



/**
@@ -413,6 +417,23 @@ public class UiccSmsController extends ISms.Stub { 
        return getPhone(subId).getAppSmsManager().createAppSpecificSmsToken(callingPkg, intent);

    }



    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        IndentingPrintWriter indentingPW =

                new IndentingPrintWriter(pw, "    " /* singleIndent */);

        for (Phone phone : PhoneFactory.getPhones()) {

            int subId = phone.getSubId();

            indentingPW.println(String.format("SmsManager for subId = %d:", subId));

            indentingPW.increaseIndent();

            if (getIccSmsInterfaceManager(subId) != null) {

                getIccSmsInterfaceManager(subId).dump(fd, indentingPW, args);

            }

            indentingPW.decreaseIndent();

        }

        indentingPW.flush();

    }





    private void sendErrorInPendingIntent(@Nullable PendingIntent intent, int errorCode) {

        if (intent != null) {

            try {