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

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

Merge "Use new StateMachine apis to check if a message is pending" into mnc-dr1.5-dev

parents de5bdca0 6238b409

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+4 −2
Original line number Diff line number Diff line
@@ -1785,8 +1785,10 @@ public final class DataConnection extends StateMachine { 


            boolean createNetworkAgent = true;

            // If a disconnect is already pending, avoid notifying all of connected

            if (DataConnection.this.getHandler().hasMessages(EVENT_DISCONNECT) ||

                    DataConnection.this.getHandler().hasMessages(EVENT_DISCONNECT_ALL)) {

            if (hasMessages(EVENT_DISCONNECT) ||

                    hasMessages(EVENT_DISCONNECT_ALL) ||

                    hasDeferredMessages(EVENT_DISCONNECT) ||

                    hasDeferredMessages(EVENT_DISCONNECT_ALL)) {

                log("DcActiveState: skipping notifyAllOfConnected()");

                createNetworkAgent = false;

            } else {