commit 8fc10c310ec3fe66d68ea2a90702ee31b329750a
author Pablo Ceballos <pceballos@google.com> Mon Jun 13 13:21:41 2016 -0700
committer Pablo Ceballos <pceballos@google.com> Mon Jun 13 20:29:00 2016 +0000
tree e444dc9c6ebc48635a5b3215e9d1ada787527e1b
parent 1f62b9459e5159ee47dda8f960b7b296bc34460a

SF: Fix HWC2 build break

Bug 29330291

Change-Id: Ifd9993ac0321c7436a17c3e64925d415ec993003

services/surfaceflinger/FenceTracker.cpp

diff --git a/services/surfaceflinger/FenceTracker.cpp b/services/surfaceflinger/FenceTracker.cpp
index 3ff9bbf..0e18a93 100644
--- a/services/surfaceflinger/FenceTracker.cpp
+++ b/services/surfaceflinger/FenceTracker.cpp
@@ -144,21 +144,16 @@
 #ifdef USE_HWC2
         if (glesComposition) {
             frame.layers.emplace(std::piecewise_construct,
-                    std::forward_as_tuple(key),
+                    std::forward_as_tuple(layerId),
                     std::forward_as_tuple(name, frameNumber, glesComposition,
-                    postedTime, FrameTimestamps::INVALID_TIME,
-                    FrameTimestamps::INVALID_TIME, acquireFence,
-                    prevReleaseFence));
+                    postedTime, 0, 0, acquireFence, prevReleaseFence));
             wasGlesCompositionDone = true;
         } else {
             frame.layers.emplace(std::piecewise_construct,
-                    std::forward_as_tuple(key),
+                    std::forward_as_tuple(layerId),
                     std::forward_as_tuple(name, frameNumber, glesComposition,
-                    postedTime, FrameTimestamps::INVALID_TIME,
-                    FrameTimestamps::INVALID_TIME, acquireFence,
-                    Fence::NO_FENCE));
-
-            auto prevLayer = prevFrame.layers.find(key);
+                    postedTime, 0, 0, acquireFence, Fence::NO_FENCE));
+            auto prevLayer = prevFrame.layers.find(layerId);
             if (prevLayer != prevFrame.layers.end()) {
                 prevLayer->second.releaseFence = prevReleaseFence;
             }