commit 49bdda6094c766e0a874bda86b9a9f191d0da6cf
author Naseer Ahmed <naseer@codeaurora.org> Sat Dec 01 18:12:59 2012 -0500
committer The Android Automerger <android-build@android.com> Sat Dec 01 17:22:26 2012 -0800
tree 39f35bb711753d53d6615d709d8ed7fbf539cb72
parent 41a47b5291d1093e32a7858f748881e9f3e5c0da

hwc: Disable mixed mode composition for secure videos

Also make sure layer cache is used correctly when
we're not using MDP composition

Bug: 7643563
Change-Id: I4dcd70c2da128b2dcbe0b72dc14031983649719d
Signed-off-by: Iliyan Malchev <malchev@google.com>

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 4baf986..20ac9a5 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -123,11 +123,11 @@
         hwc_layer_1_t *fbLayer = &list->hwLayers[last];
         if(fbLayer->handle) {
             setListStats(ctx, list, HWC_DISPLAY_PRIMARY);
-            ctx->mLayerCache->updateLayerCache(list);
             reset_layer_prop(ctx, HWC_DISPLAY_PRIMARY);
             if(!MDPComp::configure(ctx, list)) {
                 VideoOverlay::prepare(ctx, list, HWC_DISPLAY_PRIMARY);
                 FBUpdate::prepare(ctx, fbLayer, HWC_DISPLAY_PRIMARY);
+                ctx->mLayerCache->updateLayerCache(list);
             }
         }
     }

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 6f15c21..4584207 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -264,6 +264,9 @@
         return false;
     }
 
+    if(ctx->mSecureMode)
+        return false;
+
     //Check for skip layers
     if(isSkipPresent(ctx)) {
         ALOGD_IF(isDebug(), "%s: Skip layers are present",__FUNCTION__);