am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev

* commit '0beb76e108721a009381a84bde024fc9995eeed9':
  CEC: Use thread-safe version for avr info
This commit is contained in:
Jinsuk Kim
2014-11-19 00:36:27 +00:00
committed by Android Git Automerger

View File

@@ -798,7 +798,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
} }
boolean isSystemAudioActivated() { boolean isSystemAudioActivated() {
if (getAvrDeviceInfo() == null) { if (!hasSystemAudioDevice()) {
return false; return false;
} }
synchronized (mLock) { synchronized (mLock) {