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, 2 insertions, 2 deletions

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 3949186f2b..16bf324298 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -28,7 +28,7 @@ status_t layer_state_t::write(Parcel& output) const
     output.writeUint32(what);
     output.writeFloat(x);
     output.writeFloat(y);
-    output.writeUint32(z);
+    output.writeInt32(z);
     output.writeUint32(w);
     output.writeUint32(h);
     output.writeUint32(layerStack);
@@ -54,7 +54,7 @@ status_t layer_state_t::read(const Parcel& input)
     what = input.readUint32();
     x = input.readFloat();
     y = input.readFloat();
-    z = input.readUint32();
+    z = input.readInt32();
     w = input.readUint32();
     h = input.readUint32();
     layerStack = input.readUint32();