commit 1829d2820ded60ca77e5739e6b1e26ff607703ce
author Ramkumar Radhakrishnan <ramkumar@codeaurora.org> Tue Jul 23 14:54:36 2013 -0700
committer Saurabh Shah <saurshah@codeaurora.org> Thu Jul 25 15:16:46 2013 -0700
tree a230f5ab98e694d010089642b9aa2ced261773c6
parent 71ffc954f3914454526d4fc1c2357671b76255f2

hwc: move fbzorder initialization code to hwc_fbupdate.cpp

move fbzorder initialization for external during display animation
from landscape to portrait from hwc.cpp to hwc_fbupdate.cpp.

Change-Id: I4dbac87fe56f8262356043865b61a982244cd72a

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 7b0fa11..1f97db4 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -169,10 +169,6 @@
                 ctx->mExtDispConfiguring = false;
                 setListStats(ctx, list, dpy);
                 int fbZOrder = ctx->mMDPComp[dpy]->prepare(ctx, list);
-                if(ctx->deviceOrientation &&
-                    ctx->listStats[dpy].isDisplayAnimating) {
-                    fbZOrder = 0;
-                }
                 if(fbZOrder >= 0)
                     ctx->mFBUpdate[dpy]->prepare(ctx, list, fbZOrder);
 

libhwcomposer/hwc_fbupdate.cpp

diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index 2ec6019..7fb5b46 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -95,9 +95,13 @@
                 __FUNCTION__, mDpy);
             return false;
         }
-
         mDest = dest;
 
+        if((mDpy && ctx->deviceOrientation) &&
+            ctx->listStats[mDpy].isDisplayAnimating) {
+            fbZorder = 0;
+        }
+
         ovutils::eMdpFlags mdpFlags = ovutils::OV_MDP_BLEND_FG_PREMULT;
         ovutils::eIsFg isFg = ovutils::IS_FG_OFF;
         ovutils::eZorder zOrder = static_cast<ovutils::eZorder>(fbZorder);