Merge "Fixed some minor bugs in MotionEvent recycling." into kraken (ca583f09) · Commits · e / os / android_frameworks_base

core/java/android/view/MotionEvent.java

+12 −7

Original line number	Diff line number	Diff line
		@@ -255,18 +255,20 @@ public final class MotionEvent implements Parcelable {
		}

		static private MotionEvent obtain() {
		final MotionEvent ev;
		synchronized (gRecyclerLock) {
		if (gRecyclerTop == null) {
		return new MotionEvent();
		}
		MotionEvent ev = gRecyclerTop;
		ev = gRecyclerTop;
		gRecyclerTop = ev.mNext;
		gRecyclerUsed--;
		}
		ev.mRecycledLocation = null;
		ev.mRecycled = false;
		ev.mNext = null;
		return ev;
		}
		}

		/**
		* Create a new MotionEvent, filling in all of the basic values that
		@@ -620,11 +622,14 @@ public final class MotionEvent implements Parcelable {
		throw new RuntimeException(toString() + " recycled twice!", mRecycledLocation);
		}
		mRecycledLocation = new RuntimeException("Last recycled here");
		} else if (mRecycled) {
		//Log.w("MotionEvent", "Recycling event " + this, mRecycledLocation);
		} else {
		if (mRecycled) {
		throw new RuntimeException(toString() + " recycled twice!");
		}
		mRecycled = true;
		}

		//Log.w("MotionEvent", "Recycling event " + this, mRecycledLocation);
		synchronized (gRecyclerLock) {
		if (gRecyclerUsed < MAX_RECYCLED) {
		gRecyclerUsed++;