Merge "Store parameter object's intent field to local var" into cw-f-dev (4f948d7e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/BroadcastQueue.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -226,11 +226,12 @@ public final class BroadcastQueue {
		}

		public final boolean replaceParallelBroadcastLocked(BroadcastRecord r) {
		final Intent intent = r.intent;
		for (int i = mParallelBroadcasts.size() - 1; i >= 0; i--) {
		if (r.intent.filterEquals(mParallelBroadcasts.get(i).intent)) {
		if (intent.filterEquals(mParallelBroadcasts.get(i).intent)) {
		if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST,
		"***** DROPPING PARALLEL ["
		+ mQueueName + "]: " + r.intent);
		+ mQueueName + "]: " + intent);
		mParallelBroadcasts.set(i, r);
		return true;
		}
		@@ -239,11 +240,12 @@ public final class BroadcastQueue {
		}

		public final boolean replaceOrderedBroadcastLocked(BroadcastRecord r) {
		final Intent intent = r.intent;
		for (int i = mOrderedBroadcasts.size() - 1; i > 0; i--) {
		if (r.intent.filterEquals(mOrderedBroadcasts.get(i).intent)) {
		if (intent.filterEquals(mOrderedBroadcasts.get(i).intent)) {
		if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST,
		"***** DROPPING ORDERED ["
		+ mQueueName + "]: " + r.intent);
		+ mQueueName + "]: " + intent);
		mOrderedBroadcasts.set(i, r);
		return true;
		}