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

Commit 1acd0739 authored by Adam He's avatar Adam He
Browse files

Change clearEvents() to clear existing events rather than setting 

mEvents to null to remove possible NPE.

* clearEvents() needs to be called by destroy() which could cause race
condition on whether mEvents is null for other func calls.

Fixes: 185162720
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I7330e651bc890c8a86822158efcf17a61e927112
parent 8a170b2e

core/java/android/view/contentcapture/MainContentCaptureSession.java

+3 −3
Original line number Diff line number Diff line
@@ -583,9 +583,9 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
        // NOTE: we must save a reference to the current mEvents and then set it to to null,

        // otherwise clearing it would clear it in the receiving side if the service is also local.

        final List<ContentCaptureEvent> events = mEvents == null

                ? Collections.emptyList()

                : mEvents;

        mEvents = null;

                ? Collections.EMPTY_LIST

                : new ArrayList<>(mEvents);

        mEvents.clear();

        mLastComposingSpan.clear();

        return new ParceledListSlice<>(events);

    }