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

Commit 364de791 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Git Automerger
Browse files

am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of... 

am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of DeliveringState" into mnc-dev

* commit '63068219':
  Change to make sure InboundSmsHandler stm gets out of DeliveringState
parents b3798668 63068219

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

+12 −1
Original line number Diff line number Diff line
@@ -415,8 +415,19 @@ public abstract class InboundSmsHandler extends StateMachine { 


                case EVENT_BROADCAST_SMS:

                    // if any broadcasts were sent, transition to waiting state

                    if (processMessagePart((InboundSmsTracker) msg.obj)) {

                    InboundSmsTracker inboundSmsTracker = (InboundSmsTracker) msg.obj;

                    if (processMessagePart(inboundSmsTracker)) {

                        transitionTo(mWaitingState);

                    } else {

                        // if event is sent from SmsBroadcastUndelivered.broadcastSms(), and

                        // processMessagePart() returns false, the state machine will be stuck in

                        // DeliveringState until next message is received. Send message to

                        // transition to idle to avoid that so that wakelock can be released

                        log("No broadcast sent. Delete msg from raw table and return to idle " +

                                "state");

                        deleteFromRawTable(inboundSmsTracker.getDeleteWhere(),

                                inboundSmsTracker.getDeleteWhereArgs());

                        sendMessage(EVENT_RETURN_TO_IDLE);

                    }

                    return HANDLED;