commit 718e41eed7514a24bf279f35bc5b7be6b5e1f752
author Amy <amyjojo@google.com> Fri Aug 17 17:23:37 2018 -0700
committer Amy Zhang <amyjojo@google.com> Wed Aug 22 00:32:17 2018 +0000
tree 82f479674c6a2d5a715573bd7a8ecc9ed23e583d
parent ec0d236e765ee1381e9712a5217f883e83d3b4cd

cec: refine CEC enable/disable logic.

CEC is enabled in CEC HAL by default. That should still be disabled
after reboot.

And if CEC is disabled, when enable it, we should enable CEC too
as well enable system control.

BUG: 110175546

Test: local test.
Change-Id: I4b110c88c719e07bf2cc884e0682e5ab73359fd4
(cherry picked from commit 45d424c08935384e9cc9b78a69a27a30637d5454)

services/core/java/com/android/server/hdmi/HdmiControlService.java

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index a2eb1c1..c16d3cd 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -402,6 +402,8 @@
         if (mCecController != null) {
             if (mHdmiControlEnabled) {
                 initializeCec(INITIATED_BY_BOOT_UP);
+            } else {
+                mCecController.setOption(OptionKey.ENABLE_CEC, false);
             }
         } else {
             Slog.i(TAG, "Device does not support HDMI-CEC.");
@@ -2384,6 +2386,7 @@
 
     @ServiceThreadOnly
     private void enableHdmiControlService() {
+        mCecController.setOption(OptionKey.ENABLE_CEC, true);
         mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, true);
         mMhlController.setOption(OPTION_MHL_ENABLE, ENABLED);
 
@@ -2400,6 +2403,7 @@
                     @Override
                     public void run() {
                         mCecController.setOption(OptionKey.ENABLE_CEC, false);
+                        mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, false);
                         mMhlController.setOption(OPTION_MHL_ENABLE, DISABLED);
                         clearLocalDevices();
                     }