Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e41d20ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I77a06ce5f8fd884d5b95475abdf855a77689c069
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d0fbbcb 1cddcb6f

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -554,6 +554,10 @@ final class ContentCapturePerUserService 
            if (mMaster.debug) Slog.d(mTag, "onActivityEvent(): no remote service");

            if (mMaster.debug) Slog.d(mTag, "onActivityEvent(): no remote service");

            return;

            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);

        final ActivityEvent event = new ActivityEvent(activityId, componentName, type);





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

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