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
2014-11-19 00:36:27 +00:00
parent e5facf356b 0beb76e108
commit d565e0337f
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -798,7 +798,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
    }

    boolean isSystemAudioActivated() {
-        if (getAvrDeviceInfo() == null) {
+        if (!hasSystemAudioDevice()) {
            return false;
        }
        synchronized (mLock) {