am d845c26b: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1

* commit 'd845c26b0e72e67aa14b5eac4616eb5ee7d81b33':
  Fix IndexOutOfBoundsException in monkey test
This commit is contained in:
Tadashi G. Takaoka 2011-11-16 17:47:00 -08:00 committed by Android Git Automerger
commit 81632b7438

View file

@ -21,13 +21,13 @@ import com.android.inputmethod.keyboard.PointerTracker;
import java.util.LinkedList; import java.util.LinkedList;
public class PointerTrackerQueue { public class PointerTrackerQueue {
private LinkedList<PointerTracker> mQueue = new LinkedList<PointerTracker>(); private final LinkedList<PointerTracker> mQueue = new LinkedList<PointerTracker>();
public void add(PointerTracker tracker) { public synchronized void add(PointerTracker tracker) {
mQueue.add(tracker); mQueue.add(tracker);
} }
public void releaseAllPointersOlderThan(PointerTracker tracker, long eventTime) { public synchronized void releaseAllPointersOlderThan(PointerTracker tracker, long eventTime) {
if (mQueue.lastIndexOf(tracker) < 0) { if (mQueue.lastIndexOf(tracker) < 0) {
return; return;
} }
@ -47,25 +47,28 @@ public class PointerTrackerQueue {
releaseAllPointersExcept(null, eventTime); releaseAllPointersExcept(null, eventTime);
} }
public void releaseAllPointersExcept(PointerTracker tracker, long eventTime) { public synchronized void releaseAllPointersExcept(PointerTracker tracker, long eventTime) {
for (PointerTracker t : mQueue) { for (PointerTracker t : mQueue) {
if (t == tracker) if (t == tracker) {
continue; continue;
}
t.onPhantomUpEvent(t.getLastX(), t.getLastY(), eventTime); t.onPhantomUpEvent(t.getLastX(), t.getLastY(), eventTime);
} }
mQueue.clear(); mQueue.clear();
if (tracker != null) if (tracker != null) {
mQueue.add(tracker); mQueue.add(tracker);
}
} }
public void remove(PointerTracker tracker) { public synchronized void remove(PointerTracker tracker) {
mQueue.remove(tracker); mQueue.remove(tracker);
} }
public boolean isAnyInSlidingKeyInput() { public synchronized boolean isAnyInSlidingKeyInput() {
for (final PointerTracker tracker : mQueue) { for (final PointerTracker tracker : mQueue) {
if (tracker.isInSlidingKeyInput()) if (tracker.isInSlidingKeyInput()) {
return true; return true;
}
} }
return false; return false;
} }