Merge "MessageHeap.peek() should check heapIndex before removing a message" into main (426c0248) · Commits · e / os / android_frameworks_base

core/java/android/os/MessageStack.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -87,8 +87,6 @@ public final class MessageStack {
		Message quittingMsg = Message.obtain();
		quittingMsg.obj = QUITTING_NODE_OBJ;
		quittingMsg.when = when;
		/* Should never go into the heap, initialize idx to an impossible value */
		quittingMsg.heapIndex = -1;
		final boolean ret = pushMessage(quittingMsg);
		if (!ret) {
		quittingMsg.recycleUnchecked();
		@@ -334,6 +332,7 @@ public final class MessageStack {
		if (!m.isRemoved()) {
		return m;
		}
		if (m.heapIndex >= 0) {
		if (async) {
		mAsyncHeap.removeMessage(m);
		} else {
		@@ -341,6 +340,7 @@ public final class MessageStack {
		}
		}
		}
		}

		/**
		* Remove the input Message.