Merge "Make inner classes of ConcurrentMessageQueue static and/or final where able" into main (7078650b) · Commits · e / os / android_frameworks_base

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -139,7 +139,7 @@ public final class MessageQueue {
	}		}
	}		}

	private class MatchDeliverableMessages extends MessageCompare {		private static final class MatchDeliverableMessages extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -954,7 +954,7 @@ public final class MessageQueue {
	}		}
	}		}

	private class MatchBarrierToken extends MessageCompare {		private static final class MatchBarrierToken extends MessageCompare {
	int mBarrierToken;		int mBarrierToken;

	MatchBarrierToken(int token) {		MatchBarrierToken(int token) {
	@@ -1167,7 +1167,7 @@ public final class MessageQueue {
	return true;		return true;
	}		}

	private static class MatchHandlerWhatAndObject extends MessageCompare {		private static final class MatchHandlerWhatAndObject extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1199,7 +1199,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchHandlerWhatAndObjectEquals extends MessageCompare {		private static final class MatchHandlerWhatAndObjectEquals extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1232,7 +1232,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchHandlerRunnableAndObject extends MessageCompare {		private static final class MatchHandlerRunnableAndObject extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1266,7 +1266,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchHandler extends MessageCompare {		private static final class MatchHandler extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1449,7 +1449,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchHandlerRunnableAndObjectEquals extends MessageCompare {		private static final class MatchHandlerRunnableAndObjectEquals extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1512,7 +1512,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchHandlerAndObject extends MessageCompare {		private static final class MatchHandlerAndObject extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1573,7 +1573,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchHandlerAndObjectEquals extends MessageCompare {		private static final class MatchHandlerAndObjectEquals extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1680,7 +1680,7 @@ public final class MessageQueue {
	}		}
	}		}

	private static class MatchAllMessages extends MessageCompare {		private static final class MatchAllMessages extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1692,7 +1692,7 @@ public final class MessageQueue {
	findOrRemoveMessages(null, -1, null, null, 0, mMatchAllMessages, true);		findOrRemoveMessages(null, -1, null, null, 0, mMatchAllMessages, true);
	}		}

	private static class MatchAllFutureMessages extends MessageCompare {		private static final class MatchAllFutureMessages extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {

core/java/android/os/ConcurrentMessageQueue/MessageQueue.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -382,7 +382,7 @@ public final class MessageQueue {
	}		}
	}		}

	private class MatchDeliverableMessages extends MessageCompare {		private static final class MatchDeliverableMessages extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -984,7 +984,7 @@ public final class MessageQueue {
	return token;		return token;
	}		}

	private class MatchBarrierToken extends MessageCompare {		private static final class MatchBarrierToken extends MessageCompare {
	int mBarrierToken;		int mBarrierToken;

	MatchBarrierToken(int token) {		MatchBarrierToken(int token) {
	@@ -1165,7 +1165,7 @@ public final class MessageQueue {
	return foundInStack \|\| foundInQueue;		return foundInStack \|\| foundInQueue;
	}		}

	private static class MatchHandlerWhatAndObject extends MessageCompare {		private static final class MatchHandlerWhatAndObject extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1185,7 +1185,7 @@ public final class MessageQueue {
	return findOrRemoveMessages(h, what, object, null, 0, mMatchHandlerWhatAndObject, false);		return findOrRemoveMessages(h, what, object, null, 0, mMatchHandlerWhatAndObject, false);
	}		}

	private static class MatchHandlerWhatAndObjectEquals extends MessageCompare {		private static final class MatchHandlerWhatAndObjectEquals extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1206,7 +1206,7 @@ public final class MessageQueue {
	false);		false);
	}		}

	private static class MatchHandlerRunnableAndObject extends MessageCompare {		private static final class MatchHandlerRunnableAndObject extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1227,7 +1227,7 @@ public final class MessageQueue {
	return findOrRemoveMessages(h, -1, object, r, 0, mMatchHandlerRunnableAndObject, false);		return findOrRemoveMessages(h, -1, object, r, 0, mMatchHandlerRunnableAndObject, false);
	}		}

	private static class MatchHandler extends MessageCompare {		private static final class MatchHandler extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1266,7 +1266,7 @@ public final class MessageQueue {
	findOrRemoveMessages(h, -1, object, r, 0, mMatchHandlerRunnableAndObject, true);		findOrRemoveMessages(h, -1, object, r, 0, mMatchHandlerRunnableAndObject, true);
	}		}

	private static class MatchHandlerRunnableAndObjectEquals extends MessageCompare {		private static final class MatchHandlerRunnableAndObjectEquals extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1285,7 +1285,7 @@ public final class MessageQueue {
	findOrRemoveMessages(h, -1, object, r, 0, mMatchHandlerRunnableAndObjectEquals, true);		findOrRemoveMessages(h, -1, object, r, 0, mMatchHandlerRunnableAndObjectEquals, true);
	}		}

	private static class MatchHandlerAndObject extends MessageCompare {		private static final class MatchHandlerAndObject extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1303,7 +1303,7 @@ public final class MessageQueue {
	findOrRemoveMessages(h, -1, object, null, 0, mMatchHandlerAndObject, true);		findOrRemoveMessages(h, -1, object, null, 0, mMatchHandlerAndObject, true);
	}		}

	private static class MatchHandlerAndObjectEquals extends MessageCompare {		private static final class MatchHandlerAndObjectEquals extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1322,7 +1322,7 @@ public final class MessageQueue {
	findOrRemoveMessages(h, -1, object, null, 0, mMatchHandlerAndObjectEquals, true);		findOrRemoveMessages(h, -1, object, null, 0, mMatchHandlerAndObjectEquals, true);
	}		}

	private static class MatchAllMessages extends MessageCompare {		private static final class MatchAllMessages extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {
	@@ -1334,7 +1334,7 @@ public final class MessageQueue {
	findOrRemoveMessages(null, -1, null, null, 0, mMatchAllMessages, true);		findOrRemoveMessages(null, -1, null, null, 0, mMatchAllMessages, true);
	}		}

	private static class MatchAllFutureMessages extends MessageCompare {		private static final class MatchAllFutureMessages extends MessageCompare {
	@Override		@Override
	public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,		public boolean compareMessage(Message m, Handler h, int what, Object object, Runnable r,
	long when) {		long when) {