From 76e313c901b66bd248a9143e11f08e5340c752ec Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Sat, 1 Dec 2012 18:12:59 -0500 Subject: [PATCH] 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 Signed-off-by: Naseer Ahmed --- libhwcomposer/hwc.cpp | 2 +- libhwcomposer/hwc_mdpcomp.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp index 4baf986e..20ac9a57 100644 --- a/libhwcomposer/hwc.cpp +++ b/libhwcomposer/hwc.cpp @@ -123,11 +123,11 @@ static int hwc_prepare_primary(hwc_composer_device_1 *dev, 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); } } } diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp index fcbbc287..2056859d 100644 --- a/libhwcomposer/hwc_mdpcomp.cpp +++ b/libhwcomposer/hwc_mdpcomp.cpp @@ -264,6 +264,9 @@ bool MDPComp::isDoable(hwc_context_t *ctx, hwc_display_contents_1_t* list) { return false; } + if(ctx->mSecureMode) + return false; + //Check for skip layers if(isSkipPresent(ctx)) { ALOGD_IF(isDebug(), "%s: Skip layers are present",__FUNCTION__);