Merge changes I96f8ad86,I84dcd82e,Ifcece69f

* changes:
  SurfaceFlinger and libgui: Support for child layers.
  SurfaceFlinger: Use traversal functions to iterate LayerList.
  SurfaceFlinger and libgui: Switch Z-order to signed type.

1 files changed, 1 insertions, 1 deletions

diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index b47e434561..c82f6a7812 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -102,7 +102,7 @@ status_t SurfaceControl::setLayerStack(uint32_t layerStack) {
     if (err < 0) return err;
     return mClient->setLayerStack(mHandle, layerStack);
 }
-status_t SurfaceControl::setLayer(uint32_t layer) {
+status_t SurfaceControl::setLayer(int32_t layer) {
     status_t err = validate();
     if (err < 0) return err;
     return mClient->setLayer(mHandle, layer);