Merge remote-tracking branch 'quic/display.lnx.3.0-dev' into LA.HB.1.3.9

Change-Id: Ic494c2f6350da6fb5d03fbfe1f9fcfebd8b270f0

2 files changed, 7 insertions, 7 deletions

diff --git a/libqservice/QService.cpp b/libqservice/QService.cpp
index ddb4b182..546ad7ee 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::IQClient>& client) {
 }
 
 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 @@ void QService::onHdmiHotplug(int connected) {
         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 @@ void QService::onCECMessageReceived(char *msg, ssize_t len) {
         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__);
     }
 }
 
diff --git a/libqservice/QService.h b/libqservice/QService.h
index 719c9b7c..bd130fa5 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 @@ public:
     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();