From 26f537206f2cb75cb3f04d55110e1000cae489ab Mon Sep 17 00:00:00 2001
From: Marvin Ramin <marvinramin@google.com>
Date: Thu, 7 May 2020 17:17:32 +0200
Subject: [PATCH] CEC: Remove volume control changes from service thread

Bug: 155984212
Test: atest HdmiControlServiceTest
Change-Id: I7915342c706dc97e7a01385ac9baece7a0a5dc4e
---
 .../com/android/server/hdmi/HdmiControlService.java    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 53f9ebcbd8ddf..1ed5cd8240509 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -2207,13 +2207,7 @@ public class HdmiControlService extends SystemService {
         @Override
         public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) {
             enforceAccessPermission();
-            runOnServiceThread(new Runnable() {
-                @Override
-                public void run() {
-                    HdmiControlService.this.setHdmiCecVolumeControlEnabled(
-                            isHdmiCecVolumeControlEnabled);
-                }
-            });
+            HdmiControlService.this.setHdmiCecVolumeControlEnabled(isHdmiCecVolumeControlEnabled);
         }
 
         @Override
@@ -3014,7 +3008,6 @@ public class HdmiControlService extends SystemService {
     }
 
     void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {
-        assertRunOnServiceThread();
         synchronized (mLock) {
             mHdmiCecVolumeControlEnabled = isHdmiCecVolumeControlEnabled;
 
@@ -3030,7 +3023,6 @@ public class HdmiControlService extends SystemService {
     }
 
     boolean isHdmiCecVolumeControlEnabled() {
-        assertRunOnServiceThread();
         synchronized (mLock) {
             return mHdmiCecVolumeControlEnabled;
         }