Merge "CEC: Remove volume control changes from service thread" into rvc-dev am: 3e33b0fb23 am: 2f0db902e8 am: d185ee9257 am: cad9b62dcb am: 8d537146e4

Change-Id: I31d3da6b75f56f6f3f13d6f00738eb8be92025f3
This commit is contained in:
TreeHugger Robot
2020-05-12 15:37:14 +00:00
committed by Automerger Merge Worker

View File

@@ -2194,13 +2194,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
@@ -3000,7 +2994,6 @@ public class HdmiControlService extends SystemService {
}
void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {
assertRunOnServiceThread();
synchronized (mLock) {
mHdmiCecVolumeControlEnabled = isHdmiCecVolumeControlEnabled;
@@ -3016,7 +3009,6 @@ public class HdmiControlService extends SystemService {
}
boolean isHdmiCecVolumeControlEnabled() {
assertRunOnServiceThread();
synchronized (mLock) {
return mHdmiCecVolumeControlEnabled;
}