Merge "BroadcastQueue: fix proto dump regression." (25e1ad5e) · Commits · e / os / android_frameworks_base

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

+25 −20

Original line number	Diff line number	Diff line
		@@ -599,6 +599,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
		// If nothing to dispatch, send any pending result immediately
		if (r.receivers.isEmpty()) {
		scheduleResultTo(r);
		notifyFinishBroadcast(r);
		}

		traceEnd(cookie);
		@@ -1402,6 +1403,11 @@ class BroadcastQueueModernImpl extends BroadcastQueue {

		final boolean recordFinished = (r.terminalCount == r.receivers.size());
		if (recordFinished) {
		notifyFinishBroadcast(r);
		}
		}

		private void notifyFinishBroadcast(@NonNull BroadcastRecord r) {
		mService.notifyBroadcastFinishedLocked(r);
		mHistory.addBroadcastToHistoryLocked(r);

		@@ -1427,7 +1433,6 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
		manifestCount, manifestSkipCount, dispatchTime);
		}
		}
		}

		@VisibleForTesting
		@NonNull BroadcastProcessQueue getOrCreateProcessQueue(@NonNull ProcessRecord app) {