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

Commit aa0fdc50 authored by Dan Zhang's avatar Dan Zhang Committed by android-build-merger
Browse files

Merge "Fix HdmiCecLocalDevice concurrent access" am: 54908299 

am: 1494c011

Change-Id: I74f59f35e1d78bdd9dcef57a939ec7a7af625049
parents 60281b4f 1494c011

services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -660,7 +660,8 @@ abstract class HdmiCecLocalDevice { 
    @ServiceThreadOnly

    void startQueuedActions() {

        assertRunOnServiceThread();

        for (HdmiCecFeatureAction action : mActions) {

        // Use copied action list in that start() may remove itself.

        for (HdmiCecFeatureAction action : new ArrayList<>(mActions)) {

            if (!action.started()) {

                Slog.i(TAG, "Starting queued action:" + action);

                action.start();