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

Commit c0fd767a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Watchdog:do not need add or clear operation when mMonitorQueue is... 

Merge "Watchdog:do not need add or clear operation when mMonitorQueue is empty." into main am: 601d23ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3317114



Change-Id: Ib62c4a3be8e2d82bc3b357ec8a98a31ca439720e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9376ee0b 601d23ac

services/core/java/com/android/server/Watchdog.java

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ public class Watchdog implements Dumpable { 
        public void scheduleCheckLocked(long handlerCheckerTimeoutMillis) {

            mWaitMaxMillis = handlerCheckerTimeoutMillis;



            if (mCompleted) {

            if (mCompleted && !mMonitorQueue.isEmpty()) {

                // Safe to update monitors in queue, Handler is not in the middle of work

                mMonitors.addAll(mMonitorQueue);

                mMonitorQueue.clear();