commit c211978650580904a4b11b7c5b899e9d2f7ed294
author Ajay Panicker <apanicke@google.com> Wed Aug 26 14:06:34 2015 -0700
committer Andre Eisenbach <eisenbach@google.com> Wed Aug 26 19:34:52 2015 -0700
tree e612fe4d28b163ec9ee3d4d155d05fdf1556d8eb
parent 8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8

Add StateMachine.removeDeferredMessages()

Bug: 23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e

core/java/com/android/internal/util/StateMachine.java

diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java
index 916f19d..447292c 100644
--- a/core/java/com/android/internal/util/StateMachine.java
+++ b/core/java/com/android/internal/util/StateMachine.java
@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.HashMap;
 import java.util.Vector;
 
@@ -1864,6 +1865,20 @@
     }
 
     /**
+     * Removes a message from the deferred messages queue.
+     */
+    protected final void removeDeferredMessages(int what) {
+        SmHandler smh = mSmHandler;
+        if (smh == null) return;
+
+        Iterator<Message> iterator = smh.mDeferredMessages.iterator();
+        while (iterator.hasNext()) {
+            Message msg = iterator.next();
+            if (msg.what == what) iterator.remove();
+        }
+    }
+
+    /**
      * Validate that the message was sent by
      * {@link StateMachine#quit} or {@link StateMachine#quitNow}.
      * */