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

Commit 3507b251 authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove the delayed message for watch dog when handover started" am: 7b102199 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1509230

Change-Id: I67cdcc767bb777b867da689223e6d704b2fc69b5
parents d1512978 7b102199

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

+2 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ public class DataServiceManager extends Handler { 
        @Override

        public void onHandoverStarted(@DataServiceCallback.ResultCode int resultCode) {

            if (DBG) log("onHandoverStarted. resultCode = " + resultCode);

            removeMessages(EVENT_WATCHDOG_TIMEOUT, CellularDataServiceCallback.this);

            Message msg = mMessageMap.remove(asBinder());

            sendCompleteMessage(msg, resultCode);

        }
@@ -312,6 +313,7 @@ public class DataServiceManager extends Handler { 
        @Override

        public void onHandoverCancelled(@DataServiceCallback.ResultCode int resultCode) {

            if (DBG) log("onHandoverCancelled. resultCode = " + resultCode);

            removeMessages(EVENT_WATCHDOG_TIMEOUT, CellularDataServiceCallback.this);

            Message msg = mMessageMap.remove(asBinder());

            sendCompleteMessage(msg, resultCode);

        }