Merge "Framework should not send out <Inactive Source> when user disables CEC"

2019-02-13 00:21:36 +00:00
parent 18cf22a886 4db3acc94d
commit 2b5eef9eef
1 changed files with 1 additions and 1 deletions
--- 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()));
        }