commit 3930ecae036f6a6b49440f23b3cbb4fa5917b655
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 07 19:37:40 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 07 19:37:40 2015 -0800
tree 163b55520fc083f4f15c54f981363e0c5e883266
parent 9dc4222a5c6e68572f0f49d3cce02d876019efa6
parent 95675a747fdedfe7e86b896621bc9852b1f9058a

Merge "hwc: Modify MDPOnly composition to allow only secure RGB layers"

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 569f5d1..0661d5f 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2012-2015, The Linux Foundation. All rights reserved.
  * Not a Contribution, Apache license notifications and license are retained
  * for attribution purposes only.
  *
@@ -1387,6 +1387,12 @@
        }
     }
 
+    /* Bail out if we dont have any secure RGB layers */
+    if (!ctx->listStats[mDpy].secureRGBCount) {
+        reset(ctx);
+        return false;
+    }
+
     mCurrentFrame.reset(numAppLayers);
     mCurrentFrame.fbCount -= mCurrentFrame.dropCount;