commit 0564b45003238896e1803828bb89bf2a12bf1e58
author Linux Build Service Account <lnxbuild@localhost> Sun May 05 22:09:28 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun May 05 22:09:28 2013 -0700
tree b87d2835bc63ffa3d5c6cb44571333a575942e13
parent 44a54c2ea40c7480485b689700b6bfded7dbd0ea
parent 98acd09dde74b2b2e7fe92b4341df320a2449eee

Merge "hwc: Fix Idle fall back when external connected."

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 9bf0c45..f7bb192 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -221,6 +221,7 @@
 
     ctx->mOverlay->configDone();
     ctx->mRotMgr->configDone();
+    MDPComp::resetIdleFallBack();
 
     return ret;
 }

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 6977564..3d351d0 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -368,7 +368,6 @@
         ALOGD_IF(isDebug(), "%s: padding round",__FUNCTION__);
         ret = false;
     } else if(sIdleFallBack) {
-        sIdleFallBack = false;
         ALOGD_IF(isDebug(), "%s: idle fallback",__FUNCTION__);
         ret = false;
     }

libhwcomposer/hwc_mdpcomp.h

diff --git a/libhwcomposer/hwc_mdpcomp.h b/libhwcomposer/hwc_mdpcomp.h
index c5212ef..a0255b7 100644
--- a/libhwcomposer/hwc_mdpcomp.h
+++ b/libhwcomposer/hwc_mdpcomp.h
@@ -51,6 +51,7 @@
     static void timeout_handler(void *udata);
     /* Initialize MDP comp*/
     static bool init(hwc_context_t *ctx);
+    static void resetIdleFallBack() { sIdleFallBack = false; }
 
 protected:
     enum ePipeType {