Commit 9f329448 authored Dec 12, 2023 by Treehugger Robot Committed by Automerger Merge Worker Dec 12, 2023

Merge "Skip onActivityEvent when remote ContentCaptureService is dead or...

Merge "Skip onActivityEvent when remote ContentCaptureService is dead or unbound." into main am: 1cddcb6f am: e41d20ad am: d1dd1d77

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2864429

Change-Id: I97ec3ada03774227e68257834ae1b5411c862413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -554,6 +554,10 @@ final class ContentCapturePerUserService
		if (mMaster.debug) Slog.d(mTag, "onActivityEvent(): no remote service");
		return;
		}
		if (mRemoteService.getServiceInterface() == null) {
		if (mMaster.debug) Slog.d(mTag, "onActivityEvent(): remote service is dead or unbound");
		return;
		}
		final ActivityEvent event = new ActivityEvent(activityId, componentName, type);

		if (mMaster.verbose) Slog.v(mTag, "onActivityEvent(): " + event);