Merge changes from topic 'layer-wp-race' into oc-dev am: a17b14eb92

am: f39c08c906

Change-Id: I579504e93cc6c21dd13e5b8468d8b87037133a0c

diff --cc services/surfaceflinger/Layer.cpp
index 1b9a230,b4d6dca..5aed896
--- 1/services/surfaceflinger/Layer.cpp
--- 2/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@@ -1928,12 -1928,8 +1929,12 @@@ bool Layer::setDataSpace(android_datasp
      return true;
  }
  
 +android_dataspace Layer::getDataSpace() const {
 +    return mCurrentState.dataSpace;
 +}
 +
  uint32_t Layer::getLayerStack() const {
-     auto p = getParent();
+     auto p = mDrawingParent.promote();
      if (p == nullptr) {
          return getDrawingState().layerStack;
      }

diff --cc services/surfaceflinger/Layer.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger_hwc1.cpp
Simple merge