Merge "Use private object as a lock instead of synchronized method" (c7d41589) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueue.java

+145 −123

Original line number	Diff line number	Diff line
		@@ -34,15 +34,20 @@ public final class PointerTrackerQueue {
		}

		private static final int INITIAL_CAPACITY = 10;
		// Note: {@link #mExpandableArrayOfActivePointers} and {@link #mArraySize} are synchronized by
		// {@link #mExpandableArrayOfActivePointers}
		private final ArrayList<Element> mExpandableArrayOfActivePointers =
		CollectionUtils.newArrayList(INITIAL_CAPACITY);
		private int mArraySize = 0;

		public synchronized int size() {
		public int size() {
		synchronized (mExpandableArrayOfActivePointers) {
		return mArraySize;
		}
		}

		public synchronized void add(final Element pointer) {
		public void add(final Element pointer) {
		synchronized (mExpandableArrayOfActivePointers) {
		final ArrayList<Element> expandableArray = mExpandableArrayOfActivePointers;
		final int arraySize = mArraySize;
		if (arraySize < expandableArray.size()) {
		@@ -52,8 +57,10 @@ public final class PointerTrackerQueue {
		}
		mArraySize = arraySize + 1;
		}
		}

		public synchronized void remove(final Element pointer) {
		public void remove(final Element pointer) {
		synchronized (mExpandableArrayOfActivePointers) {
		final ArrayList<Element> expandableArray = mExpandableArrayOfActivePointers;
		final int arraySize = mArraySize;
		int newSize = 0;
		@@ -73,13 +80,16 @@ public final class PointerTrackerQueue {
		}
		mArraySize = newSize;
		}
		}

		public synchronized Element getOldestElement() {
		public Element getOldestElement() {
		synchronized (mExpandableArrayOfActivePointers) {
		return (mArraySize == 0) ? null : mExpandableArrayOfActivePointers.get(0);
		}
		}

		public synchronized void releaseAllPointersOlderThan(final Element pointer,
		final long eventTime) {
		public void releaseAllPointersOlderThan(final Element pointer, final long eventTime) {
		synchronized (mExpandableArrayOfActivePointers) {
		if (DEBUG) {
		Log.d(TAG, "releaseAllPoniterOlderThan: " + pointer + " " + this);
		}
		@@ -119,13 +129,14 @@ public final class PointerTrackerQueue {
		}
		mArraySize = newSize;
		}
		}

		public void releaseAllPointers(final long eventTime) {
		releaseAllPointersExcept(null, eventTime);
		}

		public synchronized void releaseAllPointersExcept(final Element pointer,
		final long eventTime) {
		public void releaseAllPointersExcept(final Element pointer, final long eventTime) {
		synchronized (mExpandableArrayOfActivePointers) {
		if (DEBUG) {
		if (pointer == null) {
		Log.d(TAG, "releaseAllPoniters: " + this);
		@@ -140,7 +151,8 @@ public final class PointerTrackerQueue {
		final Element element = expandableArray.get(index);
		if (element == pointer) {
		if (count > 0) {
		Log.w(TAG, "Found duplicated element in releaseAllPointersExcept: " + pointer);
		Log.w(TAG, "Found duplicated element in releaseAllPointersExcept: "
		+ pointer);
		}
		count++;
		} else {
		@@ -155,8 +167,10 @@ public final class PointerTrackerQueue {
		}
		mArraySize = newSize;
		}
		}

		public synchronized boolean hasModifierKeyOlderThan(final Element pointer) {
		public boolean hasModifierKeyOlderThan(final Element pointer) {
		synchronized (mExpandableArrayOfActivePointers) {
		final ArrayList<Element> expandableArray = mExpandableArrayOfActivePointers;
		final int arraySize = mArraySize;
		for (int index = 0; index < arraySize; index++) {
		@@ -170,8 +184,10 @@ public final class PointerTrackerQueue {
		}
		return false;
		}
		}

		public synchronized boolean isAnyInSlidingKeyInput() {
		public boolean isAnyInSlidingKeyInput() {
		synchronized (mExpandableArrayOfActivePointers) {
		final ArrayList<Element> expandableArray = mExpandableArrayOfActivePointers;
		final int arraySize = mArraySize;
		for (int index = 0; index < arraySize; index++) {
		@@ -182,8 +198,10 @@ public final class PointerTrackerQueue {
		}
		return false;
		}
		}

		public synchronized void cancelAllPointerTracker() {
		public void cancelAllPointerTracker() {
		synchronized (mExpandableArrayOfActivePointers) {
		final ArrayList<Element> expandableArray = mExpandableArrayOfActivePointers;
		final int arraySize = mArraySize;
		for (int index = 0; index < arraySize; index++) {
		@@ -191,18 +209,22 @@ public final class PointerTrackerQueue {
		element.cancelTracking();
		}
		}
		}

		@Override
		public synchronized String toString() {
		public String toString() {
		synchronized (mExpandableArrayOfActivePointers) {
		final StringBuilder sb = new StringBuilder();
		final ArrayList<Element> expandableArray = mExpandableArrayOfActivePointers;
		final int arraySize = mArraySize;
		for (int index = 0; index < arraySize; index++) {
		final Element element = expandableArray.get(index);
		if (sb.length() > 0)
		if (sb.length() > 0) {
		sb.append(" ");
		}
		sb.append(element.toString());
		}
		return "[" + sb.toString() + "]";
		}
		}
		}