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

Commit d1dd1d77 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 am: e41d20ad

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



Change-Id: I9d1a8b7a6a817d14e35d8e1f7c50fca874f899c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddc1c495 e41d20ad

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