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

Commit c4426af9 authored by Shuichi.Noguchi's avatar Shuichi.Noguchi Committed by Shuichi Noguchi
Browse files

Fix HdmiCecLocalDevice concurrent access 

Original implementation of HdmiCecLocalDevice expected only one thread
refers ActionList. The concurrent access causes system_server crash.
To enable for each thread to refer own ActionList without any conflict.

Test: Sanity Test on Android TV connected to AVR.
      Repeat screen off and on quickly.

Change-Id: I66f42dfbbd8d193f8a02d3ec5d51783149ddfeb2
parent 4c8fa81d

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