Enable refactored HWC for merrifield.

BZ: 95290

This refactored HWC replaces current HWC for merrifield under hardware/intel/mfld_cdk/hwc/merrifield.

Change-Id: I00986b24e70e33c13e5e81e8b3473a42166640a1
Signed-off-by: Andy Qiu <junhai.qiu@intel.com>
Signed-off-by: Jackie Li <yaodong.li@intel.com>
Reviewed-on: http://android.intel.com:8080/98227
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Gummadi, Latha C <latha.c.gummadi@intel.com>
Tested-by: Gummadi, Latha C <latha.c.gummadi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/common/observers/VsyncEventObserver.cpp b/common/observers/VsyncEventObserver.cpp
index 91792ab..45cc535 100644
--- a/common/observers/VsyncEventObserver.cpp
+++ b/common/observers/VsyncEventObserver.cpp
@@ -25,22 +25,21 @@
  *    Jackie Li <yaodong.li@intel.com>
  *
  */
-#include <Log.h>
+#include <cutils/log.h>
+
 #include <VsyncEventObserver.h>
 #include <DisplayDevice.h>
 
 namespace android {
 namespace intel {
 
-static Log& log = Log::getInstance();
-
 VsyncEventObserver::VsyncEventObserver(DisplayDevice& disp,
-                                          VsyncControl& vsync)
+                                          IVsyncControl& vsync)
     : mDisplayDevice(disp),
       mVsync(vsync),
       mEnabled(0)
 {
-    log.v("VsyncEventObserver()");
+    LOGV("VsyncEventObserver()");
 }
 
 VsyncEventObserver::~VsyncEventObserver()
@@ -50,7 +49,7 @@ VsyncEventObserver::~VsyncEventObserver()
 
 void VsyncEventObserver::control(int enabled)
 {
-    log.v("control: enabled %s", enabled ? "True" : "False");
+    LOGV("control: enabled %s", enabled ? "True" : "False");
 
     Mutex::Autolock _l(mLock);
     mEnabled = enabled;
@@ -70,7 +69,7 @@ bool VsyncEventObserver::threadLoop()
     bool ret = mVsync.wait(mDisplayDevice.getType(), timestamp);
 
     if (ret == false) {
-        log.w("threadLoop: failed to wait for vsync, check vsync enabling...");
+        LOGW("threadLoop: failed to wait for vsync, check vsync enabling...");
         return true;
     }
 
@@ -81,13 +80,13 @@ bool VsyncEventObserver::threadLoop()
 
 status_t VsyncEventObserver::readyToRun()
 {
-    log.v("VsyncEventObserver: readyToRun. disp %d", mDisplayDevice.getType());
+    LOGV("VsyncEventObserver: readyToRun. disp %d", mDisplayDevice.getType());
     return NO_ERROR;
 }
 
 void VsyncEventObserver::onFirstRef()
 {
-    log.v("VsyncEventObserver: onFirstRef. disp %d", mDisplayDevice.getType());
+    LOGV("VsyncEventObserver: onFirstRef. disp %d", mDisplayDevice.getType());
     run("VsyncEventObserver", PRIORITY_URGENT_DISPLAY);
 }