commit 356c23865d588659f1eea55bbe7e2b16b9cff08e
author Jesse Hall <jessehall@google.com> Thu Nov 07 04:43:19 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 07 04:43:20 2013 +0000
tree 7307e26787d65271adb9dddc7199f36bd6ef9847
parent 493186312a9a8c0215da0d6d3a9b0369491c0796
parent f7a675837bdad03d398c9b6f0f593b9c51c679b5

Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 2469f0c..c7d1a90 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -605,7 +605,7 @@
         mLists[i] = disp.list;
         if (mLists[i]) {
             if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {
-                mLists[i]->outbuf = NULL;
+                mLists[i]->outbuf = disp.outbufHandle;
                 mLists[i]->outbufAcquireFenceFd = -1;
             } else if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) {
                 // garbage data to catch improper use