commit 532b26380fd6d32dc5d7605bd766a2c4f00d0a80
author Courtney Goeltzenleuchter <courtneygo@google.com> Fri May 05 16:34:38 2017 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Fri May 05 16:37:21 2017 -0600
tree 047bd1e5660508eccd9a6ae18955689d1681fe0c
parent b6cc403149d8eaa2c892f8b999276d9463d73e8f

Fix emulator build

getDataSpace was inside HWC2 ifdef when it didn't need to be.
Breaking builds that were not HWC2.
Test: build android auto or emulator

Change-Id: Ief68f458a29ae985780af9defcfeccb9baf7a701

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 5f4856b..ae731f7 100755
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -874,9 +874,6 @@
     }
 }
 
-android_dataspace Layer::getDataSpace() const {
-    return mCurrentState.dataSpace;
-}
 #else
 void Layer::setPerFrameData(const sp<const DisplayDevice>& hw,
         HWComposer::HWCLayerInterface& layer) {
@@ -1887,6 +1884,10 @@
     return true;
 }
 
+android_dataspace Layer::getDataSpace() const {
+    return mCurrentState.dataSpace;
+}
+
 uint32_t Layer::getLayerStack() const {
     auto p = getParent();
     if (p == nullptr) {