From f7f991843d297a6c31648a021febe5e345bac440 Mon Sep 17 00:00:00 2001
From: Paul Colta <donpaul@google.com>
Date: Mon, 19 Jun 2023 15:05:38 +0200
Subject: [PATCH] HDMI: Guard mEarcLocalDevice.mEarcStatus with mLock

This fixes an error prone reported in udc-tv-dev cherry-pick.

Test: atest HdmiCecAtomLoggingTest
Bug: 287180347
Change-Id: I4a6b6e62e01d8ee2be17c5620cf926e9c9dd610e
---
 .../core/java/com/android/server/hdmi/HdmiControlService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 1034b0a36781d..f2d72c0c73699 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -4689,7 +4689,9 @@ public class HdmiControlService extends SystemService {
     private int getEarcStatus() {
         assertRunOnServiceThread();
         if (mEarcLocalDevice != null) {
-            return mEarcLocalDevice.mEarcStatus;
+            synchronized (mLock) {
+                return mEarcLocalDevice.mEarcStatus;
+            }
         }
         return HDMI_EARC_STATUS_UNKNOWN;
     }