Merge "Remove legacy BroadcastQueue implementation." into main (cb4a7bd1) · Commits · e / os / android_frameworks_base

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

+41 −148

Original line number	Diff line number	Diff line
		@@ -141,7 +141,6 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALLOWLISTS;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKUP;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST_BACKGROUND;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST_LIGHT;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_MU;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_NETWORK;
		@@ -726,29 +725,19 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Whether we should use SCHED_FIFO for UI and RenderThreads.
		final boolean mUseFifoUiScheduling;

		// Use an offload queue for long broadcasts, e.g. BOOT_COMPLETED.
		// For simplicity, since we statically declare the size of the array of BroadcastQueues,
		// we still create this new offload queue, but never ever put anything on it.
		final boolean mEnableOffloadQueue;

		/**
		* Flag indicating if we should use {@link BroadcastQueueModernImpl} instead
		* of the default {@link BroadcastQueueImpl}.
		*/
		final boolean mEnableModernQueue;

		static final int BROADCAST_QUEUE_FG = 0;
		static final int BROADCAST_QUEUE_BG = 1;
		static final int BROADCAST_QUEUE_BG_OFFLOAD = 2;
		static final int BROADCAST_QUEUE_FG_OFFLOAD = 3;

		@GuardedBy("this")
		private final SparseArray<IUnsafeIntentStrictModeCallback>
		mStrictModeCallbacks = new SparseArray<>();

		// Convenient for easy iteration over the queues. Foreground is first
		// so that dispatch of foreground broadcasts gets precedence.
		final BroadcastQueue[] mBroadcastQueues;
		private BroadcastQueue mBroadcastQueue;

		@GuardedBy("this")
		BroadcastStats mLastBroadcastStats;
		@@ -758,43 +747,6 @@ public class ActivityManagerService extends IActivityManager.Stub

		TraceErrorLogger mTraceErrorLogger;

		BroadcastQueue broadcastQueueForIntent(Intent intent) {
		return broadcastQueueForFlags(intent.getFlags(), intent);
		}

		BroadcastQueue broadcastQueueForFlags(int flags) {
		return broadcastQueueForFlags(flags, null);
		}

		BroadcastQueue broadcastQueueForFlags(int flags, Object cookie) {
		if (mEnableModernQueue) {
		return mBroadcastQueues[0];
		}

		if (isOnFgOffloadQueue(flags)) {
		if (DEBUG_BROADCAST_BACKGROUND) {
		Slog.i(TAG_BROADCAST,
		"Broadcast intent " + cookie + " on foreground offload queue");
		}
		return mBroadcastQueues[BROADCAST_QUEUE_FG_OFFLOAD];
		}

		if (isOnBgOffloadQueue(flags)) {
		if (DEBUG_BROADCAST_BACKGROUND) {
		Slog.i(TAG_BROADCAST,
		"Broadcast intent " + cookie + " on background offload queue");
		}
		return mBroadcastQueues[BROADCAST_QUEUE_BG_OFFLOAD];
		}

		final boolean isFg = (flags & Intent.FLAG_RECEIVER_FOREGROUND) != 0;
		if (DEBUG_BROADCAST_BACKGROUND) Slog.i(TAG_BROADCAST,
		"Broadcast intent " + cookie + " on "
		+ (isFg ? "foreground" : "background") + " queue");
		return (isFg) ? mBroadcastQueues[BROADCAST_QUEUE_FG]
		: mBroadcastQueues[BROADCAST_QUEUE_BG];
		}

		private volatile int mDeviceOwnerUid = INVALID_UID;

		/**
		@@ -2556,9 +2508,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		mInternal = new LocalService();
		mPendingStartActivityUids = new PendingStartActivityUids();
		mUseFifoUiScheduling = false;
		mEnableOffloadQueue = false;
		mEnableModernQueue = false;
		mBroadcastQueues = injector.getBroadcastQueues(this);
		mBroadcastQueue = injector.getBroadcastQueue(this);
		mComponentAliasResolver = new ComponentAliasResolver(this);
		}

		@@ -2599,12 +2550,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		? new OomAdjusterModernImpl(this, mProcessList, activeUids)
		: new OomAdjuster(this, mProcessList, activeUids);

		mEnableOffloadQueue = SystemProperties.getBoolean(
		"persist.device_config.activity_manager_native_boot.offload_queue_enabled", true);
		mEnableModernQueue = new BroadcastConstants(
		Settings.Global.BROADCAST_FG_CONSTANTS).MODERN_QUEUE_ENABLED;

		mBroadcastQueues = mInjector.getBroadcastQueues(this);
		mBroadcastQueue = mInjector.getBroadcastQueue(this);

		mServices = new ActiveServices(this);
		mCpHelper = new ContentProviderHelper(this, true);
		@@ -2671,6 +2620,14 @@ public class ActivityManagerService extends IActivityManager.Stub
		mComponentAliasResolver = new ComponentAliasResolver(this);
		}

		void setBroadcastQueueForTest(BroadcastQueue broadcastQueue) {
		mBroadcastQueue = broadcastQueue;
		}

		BroadcastQueue getBroadcastQueue() {
		return mBroadcastQueue;
		}

		public void setSystemServiceManager(SystemServiceManager mgr) {
		mSystemServiceManager = mgr;
		}
		@@ -4280,19 +4237,14 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		// Clean-up disabled broadcast receivers.
		for (int i = mBroadcastQueues.length - 1; i >= 0; i--) {
		mBroadcastQueues[i].cleanupDisabledPackageReceiversLocked(
		mBroadcastQueue.cleanupDisabledPackageReceiversLocked(
		packageName, disabledClasses, userId);
		}

		}

		final boolean clearBroadcastQueueForUserLocked(int userId) {
		boolean didSomething = false;
		for (int i = mBroadcastQueues.length - 1; i >= 0; i--) {
		didSomething \|= mBroadcastQueues[i].cleanupDisabledPackageReceiversLocked(
		boolean didSomething = mBroadcastQueue.cleanupDisabledPackageReceiversLocked(
		null, null, userId);
		}
		return didSomething;
		}

		@@ -4445,11 +4397,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		mUgmInternal.removeUriPermissionsForPackage(packageName, userId, false, false);

		if (doit) {
		for (i = mBroadcastQueues.length - 1; i >= 0; i--) {
		didSomething \|= mBroadcastQueues[i].cleanupDisabledPackageReceiversLocked(
		didSomething \|= mBroadcastQueue.cleanupDisabledPackageReceiversLocked(
		packageName, null, userId);
		}
		}

		if (packageName == null \|\| uninstalling \|\| packageStateStopped) {
		didSomething \|= mPendingIntentController.removePendingIntentsForPackage(
		@@ -4515,9 +4465,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Take care of any services that are waiting for the process.
		mServices.processStartTimedOutLocked(app);
		// Take care of any broadcasts waiting for the process.
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.onApplicationTimeoutLocked(app);
		}
		mBroadcastQueue.onApplicationTimeoutLocked(app);
		if (!isKillTimeout) {
		mBatteryStatsService.noteProcessFinish(app.processName, app.info.uid);
		app.killLocked("start timeout",
		@@ -4959,9 +4907,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Check if a next-broadcast receiver is in this process...
		if (!badApp) {
		try {
		for (BroadcastQueue queue : mBroadcastQueues) {
		didSomething \|= queue.onApplicationAttachedLocked(app);
		}
		didSomething \|= mBroadcastQueue.onApplicationAttachedLocked(app);
		checkTime(startTime, "finishAttachApplicationInner: "
		+ "after dispatching broadcasts");
		} catch (BroadcastDeliveryFailedException e) {
		@@ -9101,9 +9047,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		private void startBroadcastObservers() {
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.start(mContext.getContentResolver());
		}
		mBroadcastQueue.start(mContext.getContentResolver());
		}

		private void updateForceBackgroundCheck(boolean enabled) {
		@@ -11509,9 +11453,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}
		mReceiverResolver.dumpDebug(proto, ActivityManagerServiceDumpBroadcastsProto.RECEIVER_RESOLVER);
		for (BroadcastQueue q : mBroadcastQueues) {
		q.dumpDebug(proto, ActivityManagerServiceDumpBroadcastsProto.BROADCAST_QUEUE);
		}
		mBroadcastQueue.dumpDebug(proto, ActivityManagerServiceDumpBroadcastsProto.BROADCAST_QUEUE);
		synchronized (mStickyBroadcasts) {
		for (int user = 0; user < mStickyBroadcasts.size(); user++) {
		long token = proto.start(
		@@ -11661,12 +11603,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		if (!onlyReceivers) {
		for (BroadcastQueue q : mBroadcastQueues) {
		needSep = q.dumpLocked(fd, pw, args, opti,
		needSep = mBroadcastQueue.dumpLocked(fd, pw, args, opti,
		dumpConstants, dumpHistory, dumpAll, dumpPackage, needSep);
		printedAnything \|= needSep;
		}
		}

		needSep = true;

		@@ -11721,9 +11661,8 @@ public class ActivityManagerService extends IActivityManager.Stub

		if (!onlyHistory && !onlyReceivers && dumpAll) {
		pw.println();
		for (BroadcastQueue queue : mBroadcastQueues) {
		pw.println(" Queue " + queue.toString() + ": " + queue.describeStateLocked());
		}
		pw.println(" Queue " + mBroadcastQueue.toString() + ": "
		+ mBroadcastQueue.describeStateLocked());
		pw.println(" mHandler:");
		mHandler.dump(new PrintWriterPrinter(pw), " ");
		needSep = true;
		@@ -13571,9 +13510,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		mOomAdjuster.mCachedAppOptimizer.onCleanupApplicationRecordLocked(app);
		}
		mAppProfiler.onCleanupApplicationRecordLocked(app);
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.onApplicationCleanupLocked(app);
		}
		mBroadcastQueue.onApplicationCleanupLocked(app);
		clearProcessForegroundLocked(app);
		mServices.killServicesLocked(app, allowRestart);
		mPhantomProcessList.onAppDied(pid);
		@@ -14687,7 +14624,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		originalStickyCallingUid))) {
		sticky = broadcast.intent;
		}
		BroadcastQueue queue = broadcastQueueForIntent(broadcast.intent);
		BroadcastQueue queue = mBroadcastQueue;
		BroadcastRecord r = new BroadcastRecord(queue, broadcast.intent, null,
		null, null, -1, -1, false, null, null, null, null, OP_NONE,
		BroadcastOptions.makeWithDeferUntilActive(broadcast.deferUntilActive),
		@@ -15686,7 +15623,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		checkBroadcastFromSystem(intent, callerApp, callerPackage, callingUid,
		isProtectedBroadcast, registeredReceivers);
		}
		final BroadcastQueue queue = broadcastQueueForIntent(intent);
		final BroadcastQueue queue = mBroadcastQueue;
		BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage,
		callerFeatureId, callingPid, callingUid, callerInstantApp, resolvedType,
		requiredPermissions, excludedPermissions, excludedPackages, appOp, brOptions,
		@@ -15779,7 +15716,7 @@ public class ActivityManagerService extends IActivityManager.Stub

		if ((receivers != null && receivers.size() > 0)
		\|\| resultTo != null) {
		BroadcastQueue queue = broadcastQueueForIntent(intent);
		BroadcastQueue queue = mBroadcastQueue;
		filterNonExportedComponents(intent, callingUid, callingPid, receivers,
		mPlatformCompat, callerPackage, resolvedType);
		BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage,
		@@ -16067,9 +16004,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		void backgroundServicesFinishedLocked(int userId) {
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.backgroundServicesFinishedLocked(userId);
		}
		mBroadcastQueue.backgroundServicesFinishedLocked(userId);
		}

		public void finishReceiver(IBinder caller, int resultCode, String resultData,
		@@ -16090,8 +16025,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		return;
		}

		final BroadcastQueue queue = broadcastQueueForFlags(flags);
		queue.finishReceiverLocked(callerApp, resultCode,
		mBroadcastQueue.finishReceiverLocked(callerApp, resultCode,
		resultData, resultExtras, resultAbort, true);
		// updateOomAdjLocked() will be done here
		trimApplicationsLocked(false, OOM_ADJ_REASON_FINISH_RECEIVER);
		@@ -16682,10 +16616,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		// =========================================================

		boolean isReceivingBroadcastLocked(ProcessRecord app, int[] outSchedGroup) {
		int res = ProcessList.SCHED_GROUP_UNDEFINED;
		for (BroadcastQueue queue : mBroadcastQueues) {
		res = Math.max(res, queue.getPreferredSchedulingGroupLocked(app));
		}
		final int res = mBroadcastQueue.getPreferredSchedulingGroupLocked(app);
		outSchedGroup[0] = res;
		return res != ProcessList.SCHED_GROUP_UNDEFINED;
		}
		@@ -16809,11 +16740,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		*/
		@GuardedBy("this")
		final boolean canGcNowLocked() {
		for (BroadcastQueue q : mBroadcastQueues) {
		if (!q.isIdleLocked()) {
		if (!mBroadcastQueue.isIdleLocked()) {
		return false;
		}
		}
		return mAtmInternal.canGcNow();
		}

		@@ -18022,9 +17951,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		void onProcessFreezableChangedLocked(ProcessRecord app) {
		if (mEnableModernQueue) {
		mBroadcastQueues[0].onProcessFreezableChangedLocked(app);
		}
		mBroadcastQueue.onProcessFreezableChangedLocked(app);
		}

		@VisibleForTesting
		@@ -19715,9 +19642,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (flushBroadcastLoopers) {
		BroadcastLoopers.waitForIdle(pw);
		}
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.waitForIdle(pw);
		}
		mBroadcastQueue.waitForIdle(pw);
		pw.println("All broadcast queues are idle!");
		pw.flush();
		}
		@@ -19733,9 +19658,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (flushBroadcastLoopers) {
		BroadcastLoopers.waitForBarrier(pw);
		}
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.waitForBarrier(pw);
		}
		mBroadcastQueue.waitForBarrier(pw);
		if (flushApplicationThreads) {
		waitForApplicationBarrier(pw);
		}
		@@ -19811,9 +19734,7 @@ public class ActivityManagerService extends IActivityManager.Stub

		void waitForBroadcastDispatch(@NonNull PrintWriter pw, @NonNull Intent intent) {
		enforceCallingPermission(permission.DUMP, "waitForBroadcastDispatch");
		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.waitForDispatched(intent, pw);
		}
		mBroadcastQueue.waitForDispatched(intent, pw);
		}

		void setIgnoreDeliveryGroupPolicy(@NonNull String broadcastAction) {
		@@ -19858,9 +19779,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		return;
		}

		for (BroadcastQueue queue : mBroadcastQueues) {
		queue.forceDelayBroadcastDelivery(targetPackage, delayedDurationMs);
		}
		mBroadcastQueue.forceDelayBroadcastDelivery(targetPackage, delayedDurationMs);
		}

		@Override
		@@ -20414,7 +20333,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		return mNmi != null;
		}

		public BroadcastQueue[] getBroadcastQueues(ActivityManagerService service) {
		public BroadcastQueue getBroadcastQueue(ActivityManagerService service) {
		// Broadcast policy parameters
		final BroadcastConstants foreConstants = new BroadcastConstants(
		Settings.Global.BROADCAST_FG_CONSTANTS);
		@@ -20430,26 +20349,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		// by default, no "slow" policy in this queue
		offloadConstants.SLOW_TIME = Integer.MAX_VALUE;

		final BroadcastQueue[] broadcastQueues;
		final Handler handler = service.mHandler;
		if (service.mEnableModernQueue) {
		broadcastQueues = new BroadcastQueue[1];
		broadcastQueues[0] = new BroadcastQueueModernImpl(service, handler,
		return new BroadcastQueueModernImpl(service, service.mHandler,
		foreConstants, backConstants);
		} else {
		broadcastQueues = new BroadcastQueue[4];
		broadcastQueues[BROADCAST_QUEUE_FG] = new BroadcastQueueImpl(service, handler,
		"foreground", foreConstants, false, ProcessList.SCHED_GROUP_DEFAULT);
		broadcastQueues[BROADCAST_QUEUE_BG] = new BroadcastQueueImpl(service, handler,
		"background", backConstants, true, ProcessList.SCHED_GROUP_BACKGROUND);
		broadcastQueues[BROADCAST_QUEUE_BG_OFFLOAD] = new BroadcastQueueImpl(service,
		handler, "offload_bg", offloadConstants, true,
		ProcessList.SCHED_GROUP_BACKGROUND);
		broadcastQueues[BROADCAST_QUEUE_FG_OFFLOAD] = new BroadcastQueueImpl(service,
		handler, "offload_fg", foreConstants, true,
		ProcessList.SCHED_GROUP_BACKGROUND);
		}
		return broadcastQueues;
		}

		/** @see Binder#getCallingUid */
		@@ -20771,14 +20672,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		private boolean isOnFgOffloadQueue(int flags) {
		return ((flags & Intent.FLAG_RECEIVER_OFFLOAD_FOREGROUND) != 0);
		}

		private boolean isOnBgOffloadQueue(int flags) {
		return (mEnableOffloadQueue && ((flags & Intent.FLAG_RECEIVER_OFFLOAD) != 0));
		}

		@Override
		public ParcelFileDescriptor getLifeMonitor() {
		if (!isCallerShell()) {

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

deleted100644 → 0

+0 −1266

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0

+0 −1983

File deleted.

Preview size limit exceeded, changes collapsed.

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

+61 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ import static android.app.ActivityManagerInternal.OOM_ADJ_REASON_START_RECEIVER;
		import static android.os.Process.ZYGOTE_POLICY_FLAG_EMPTY;
		import static android.os.Process.ZYGOTE_POLICY_FLAG_LATENCY_SENSITIVE;

		import static com.android.internal.util.FrameworkStatsLog.BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED;
		import static com.android.internal.util.FrameworkStatsLog.BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED__EVENT__BOOT_COMPLETED;
		import static com.android.internal.util.FrameworkStatsLog.BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED__EVENT__LOCKED_BOOT_COMPLETED;
		import static com.android.internal.util.FrameworkStatsLog.BROADCAST_DELIVERY_EVENT_REPORTED;
		import static com.android.internal.util.FrameworkStatsLog.BROADCAST_DELIVERY_EVENT_REPORTED__PROC_START_TYPE__PROCESS_START_TYPE_COLD;
		import static com.android.internal.util.FrameworkStatsLog.BROADCAST_DELIVERY_EVENT_REPORTED__PROC_START_TYPE__PROCESS_START_TYPE_UNKNOWN;
		@@ -59,6 +62,7 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.pm.UserInfo;
		import android.os.Bundle;
		import android.os.BundleMerger;
		import android.os.Handler;
		@@ -85,9 +89,12 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.os.TimeoutRecord;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.server.LocalServices;
		import com.android.server.am.BroadcastProcessQueue.BroadcastConsumer;
		import com.android.server.am.BroadcastProcessQueue.BroadcastPredicate;
		import com.android.server.am.BroadcastRecord.DeliveryState;
		import com.android.server.pm.UserJourneyLogger;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.utils.AnrTimer;

		import dalvik.annotation.optimization.NeverCompile;
		@@ -2120,7 +2127,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
		r.nextReceiver = r.receivers.size();
		mHistory.onBroadcastFinishedLocked(r);

		BroadcastQueueImpl.logBootCompletedBroadcastCompletionLatencyIfPossible(r);
		logBootCompletedBroadcastCompletionLatencyIfPossible(r);

		if (r.intent.getComponent() == null && r.intent.getPackage() == null
		&& (r.intent.getFlags() & Intent.FLAG_RECEIVER_REGISTERED_ONLY) == 0) {
		@@ -2216,6 +2223,59 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
		return null;
		}

		private void logBootCompletedBroadcastCompletionLatencyIfPossible(BroadcastRecord r) {
		// Only log after last receiver.
		// In case of split BOOT_COMPLETED broadcast, make sure only call this method on the
		// last BroadcastRecord of the split broadcast which has non-null resultTo.
		final int numReceivers = (r.receivers != null) ? r.receivers.size() : 0;
		if (r.nextReceiver < numReceivers) {
		return;
		}
		final String action = r.intent.getAction();
		int event = 0;
		if (Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(action)) {
		event = BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED__EVENT__LOCKED_BOOT_COMPLETED;
		} else if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
		event = BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED__EVENT__BOOT_COMPLETED;
		}
		if (event != 0) {
		final int dispatchLatency = (int) (r.dispatchTime - r.enqueueTime);
		final int completeLatency = (int) (SystemClock.uptimeMillis() - r.enqueueTime);
		final int dispatchRealLatency = (int) (r.dispatchRealTime - r.enqueueRealTime);
		final int completeRealLatency = (int)
		(SystemClock.elapsedRealtime() - r.enqueueRealTime);
		int userType =
		FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__TYPE_UNKNOWN;
		// This method is called very infrequently, no performance issue we call
		// LocalServices.getService() here.
		final UserManagerInternal umInternal = LocalServices.getService(
		UserManagerInternal.class);
		final UserInfo userInfo =
		(umInternal != null) ? umInternal.getUserInfo(r.userId) : null;
		if (userInfo != null) {
		userType = UserJourneyLogger.getUserTypeForStatsd(userInfo.userType);
		}
		Slog.i(TAG, "BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED action:"
		+ action
		+ " dispatchLatency:" + dispatchLatency
		+ " completeLatency:" + completeLatency
		+ " dispatchRealLatency:" + dispatchRealLatency
		+ " completeRealLatency:" + completeRealLatency
		+ " receiversSize:" + numReceivers
		+ " userId:" + r.userId
		+ " userType:" + (userInfo != null ? userInfo.userType : null));
		FrameworkStatsLog.write(
		BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED,
		event,
		dispatchLatency,
		completeLatency,
		dispatchRealLatency,
		completeRealLatency,
		r.userId,
		userType);
		}
		}

		@Override
		@NeverCompile
		public void dumpDebug(@NonNull ProtoOutputStream proto, long fieldId) {

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -718,9 +718,7 @@ class ProcessErrorStateRecord {
		mService.mContext, mApp.info.packageName, mApp.info.flags);
		}
		}
		for (BroadcastQueue queue : mService.mBroadcastQueues) {
		queue.onApplicationProblemLocked(mApp);
		}
		mService.getBroadcastQueue().onApplicationProblemLocked(mApp);
		}

		@GuardedBy("mService")