Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Remove volume control changes from service thread" into rvc-dev am: 3e33b0fb23

Browse Source 
Change-Id: If462633f383214257066896a54614cc3fda187f2
This commit is contained in:
TreeHugger Robot
2020-05-12 14:36:02 +00:00
committed by Automerger Merge Worker
parent b64f3a3fe4 3e33b0fb23
commit 2f0db902e8
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -2195,13 +2195,7 @@ public class HdmiControlService extends SystemService {
@Override @Override
public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) { public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) {
enforceAccessPermission(); enforceAccessPermission();
runOnServiceThread(new Runnable() { HdmiControlService.this.setHdmiCecVolumeControlEnabled(isHdmiCecVolumeControlEnabled);
@Override
public void run() {
HdmiControlService.this.setHdmiCecVolumeControlEnabled(
isHdmiCecVolumeControlEnabled);
}
});
} }
@Override @Override
@@ -3002,7 +2996,6 @@ public class HdmiControlService extends SystemService {
} }
void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) { void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {
assertRunOnServiceThread();
synchronized (mLock) { synchronized (mLock) {
mHdmiCecVolumeControlEnabled = isHdmiCecVolumeControlEnabled; mHdmiCecVolumeControlEnabled = isHdmiCecVolumeControlEnabled;
@@ -3018,7 +3011,6 @@ public class HdmiControlService extends SystemService {
} }
boolean isHdmiCecVolumeControlEnabled() { boolean isHdmiCecVolumeControlEnabled() {
assertRunOnServiceThread();
synchronized (mLock) { synchronized (mLock) {
return mHdmiCecVolumeControlEnabled; return mHdmiCecVolumeControlEnabled;
} }