From 4db3acc94d78990e1f92cd005b00fa2b58f7b34f Mon Sep 17 00:00:00 2001 From: Amy Date: Wed, 6 Feb 2019 15:49:02 -0800 Subject: [PATCH] Framework should not send out when user disables CEC According to the spec, should only be sent when the current device is going to standby or has nothing to broadcast. Test: manual Bug: 121436383 Change-Id: I07e16f311e82e18ab11981369fbdfbeddc01c4ff (cherry picked from commit 424d00da8406232ce289faf5ab55a2541951280c) --- .../com/android/server/hdmi/HdmiCecLocalDevicePlayback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java index 20933db803b9b..560f7a03b20fd 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java @@ -342,7 +342,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { super.disableDevice(initiatedByCec, callback); assertRunOnServiceThread(); - if (!initiatedByCec && mIsActiveSource) { + if (!initiatedByCec && mIsActiveSource && mService.isControlEnabled()) { mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource( mAddress, mService.getPhysicalAddress())); }