commit ad78055746c9b1b3f0563133971800812bfed1f6
author Jesse Hall <jessehall@google.com> Wed Nov 06 21:12:40 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 06 21:12:40 2013 -0800
tree e0666e18383a1b0f1f95e59e11466a288247e50f
parent bcd66ecb41f6492b9aa664010c48233cfaf6554e
parent 2d32aa5918de1c12c54a32e8eb28bbc96d430796

am 2d32aa59: am 356c2386: Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev

* commit '2d32aa5918de1c12c54a32e8eb28bbc96d430796':
  Provide virtual display output buffer to HWC in prepare

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 6a35efa..642702f 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -604,7 +604,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