commit 8118d4b5b9f3f92279f7e1de3ee623f78f4d550e
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 10 19:52:32 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 10 19:52:32 2014 -0700
tree 93852341d17e06983b848171bf11bbe325969e45
parent f35a794a47d7d3fc6e8ff29c8b5cd7acf6bd5f80
parent f68d0dfdbf0e065e46ef9e36dbb5b607e1a6e71d

Merge "hwc: Display view frame needs to be set before using it."

libhwcomposer/hwc_utils.cpp

diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 5a6c154..ceb09ea 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -820,13 +820,13 @@
     ctx->mViewFrame[dpy] = (hwc_rect_t){0, 0, 0, 0};
     ctx->dpyAttr[dpy].mActionSafePresent = isActionSafePresent(ctx, dpy);
 
-    trimList(ctx, list, dpy);
-    optimizeLayerRects(list);
-
     // Calculate view frame of ext display from primary resolution
     // and primary device orientation.
     ctx->mViewFrame[dpy] = calculateDisplayViewFrame(ctx, dpy);
 
+    trimList(ctx, list, dpy);
+    optimizeLayerRects(list);
+
     for (size_t i = 0; i < (size_t)ctx->listStats[dpy].numAppLayers; i++) {
         hwc_layer_1_t const* layer = &list->hwLayers[i];
         private_handle_t *hnd = (private_handle_t *)layer->handle;