commit ad4cc06a177cc280f47b0dea51fcf51b7fbe6435
author Tatenda Chipeperekwa <tatendac@codeaurora.org> Fri Apr 01 12:24:10 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 20 23:41:03 2016 -0700
tree 97867bedf43702a6e17f1f19ebc5f7e80b9222e3
parent 13378a0ea756ec5caf691412a8a52260eaa7af46

qservice: Fixes for IQHDMIClient

- Fix compilation issue to make IQHDMIClient accessible from SDM
- Change the log level from ERROR to WARNING if the IQHDMIClient
  is not present. This is not a fatal state and can be treated as
  a warning.

CRs-Fixed: 814136
Change-Id: Ia37cad912ff77c505b81c705f80c5f7daf75f9d7

libqservice/QService.cpp

diff --git a/libqservice/QService.cpp b/libqservice/QService.cpp
index ddb4b18..546ad7e 100644
--- a/libqservice/QService.cpp
+++ b/libqservice/QService.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+ *  Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -55,7 +55,7 @@
 }
 
 void QService::connect(const sp<qClient::IQHDMIClient>& client) {
-    ALOGD_IF(QSERVICE_DEBUG,"HWC client connected");
+    ALOGD_IF(QSERVICE_DEBUG,"HDMI client connected");
     mHDMIClient = client;
 }
 
@@ -82,7 +82,7 @@
         ALOGD_IF(QSERVICE_DEBUG, "%s: HDMI hotplug", __FUNCTION__);
         mHDMIClient->onHdmiHotplug(connected);
     } else {
-        ALOGE("%s: Failed to get a valid HDMI client", __FUNCTION__);
+        ALOGW("%s: Failed to get a valid HDMI client", __FUNCTION__);
     }
 }
 
@@ -91,7 +91,7 @@
         ALOGD_IF(QSERVICE_DEBUG, "%s: CEC message received", __FUNCTION__);
         mHDMIClient->onCECMessageRecieved(msg, len);
     } else {
-        ALOGE("%s: Failed to get a valid HDMI client", __FUNCTION__);
+        ALOGW("%s: Failed to get a valid HDMI client", __FUNCTION__);
     }
 }
 

libqservice/QService.h

diff --git a/libqservice/QService.h b/libqservice/QService.h
index 719c9b7..bd130fa 100644
--- a/libqservice/QService.h
+++ b/libqservice/QService.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *  Copyright (c) 2012-2013, 2016, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -50,8 +50,8 @@
     virtual android::status_t dispatch(uint32_t command,
             const android::Parcel* data,
             android::Parcel* reply);
-    void onHdmiHotplug(int connected);
-    void onCECMessageReceived(char *msg, ssize_t len);
+    virtual void onHdmiHotplug(int connected);
+    virtual void onCECMessageReceived(char *msg, ssize_t len);
     static void init();
 private:
     QService();