commit f3a43c8d5e6b77ff11ec6c136747a058762237ff
author Shraddha Basantwani <shraddha.basantwani@ittiam.com> Thu May 27 19:40:17 2021 +0530
committer Shraddha Basantwani <shraddha.basantwani@ittiam.com> Fri Jun 18 16:12:42 2021 +0530
tree 478ced912bcee79ce97b498d999f5d8af341e209
parent 19c7c575f08c0c76e511959d1604887659dd3d5c

CEC: Initialise the HAL based on default implementation

Bug: 185434120
Test: manual
Change-Id: I4bbe5e799388b0f17c532108dca4c2f037f1ff33

tv/cec/1.0/default/HdmiCec.cpp

diff --git a/tv/cec/1.0/default/HdmiCec.cpp b/tv/cec/1.0/default/HdmiCec.cpp
index 171bdfe..74de785 100644
--- a/tv/cec/1.0/default/HdmiCec.cpp
+++ b/tv/cec/1.0/default/HdmiCec.cpp
@@ -20,6 +20,7 @@
 #include <hardware/hardware.h>
 #include <hardware/hdmi_cec.h>
 #include "HdmiCec.h"
+#include "HdmiCecDefault.h"
 
 namespace android {
 namespace hardware {
@@ -390,6 +391,15 @@
     return mDevice->is_connected(mDevice, portId) > 0;
 }
 
+IHdmiCec* getHdmiCecDefault() {
+    HdmiCecDefault* hdmiCecDefault = new HdmiCecDefault();
+    Result result = hdmiCecDefault->init();
+    if (result == Result::SUCCESS) {
+        return hdmiCecDefault;
+    }
+    LOG(ERROR) << "Failed to load default HAL.";
+    return nullptr;
+}
 
 IHdmiCec* HIDL_FETCH_IHdmiCec(const char* hal) {
     hdmi_cec_device_t* hdmi_cec_device;
@@ -410,7 +420,7 @@
         return new HdmiCec(hdmi_cec_device);
     } else {
         LOG(ERROR) << "Passthrough failed to load legacy HAL.";
-        return nullptr;
+        return getHdmiCecDefault();
     }
 }