From 28947d7fbf9f486539322e8e12dd057568e180c2 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Wed, 8 Aug 2012 18:51:15 -0700
Subject: [PATCH] now able to set the layer stack on a DisplayDevice

Change-Id: Ia9691cf221b9444c243eb468d9e276a30e600b6b
---
 services/surfaceflinger/DisplayDevice.cpp  | 7 +++++++
 services/surfaceflinger/DisplayDevice.h    | 2 ++
 services/surfaceflinger/SurfaceFlinger.cpp | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 56ac63578f..326a1240ed 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -313,6 +313,13 @@ bool DisplayDevice::isScreenAcquired() const {
 
 // ----------------------------------------------------------------------------
 
+void DisplayDevice::setLayerStack(uint32_t stack) {
+    mLayerStack = stack;
+    dirtyRegion.set(bounds());
+}
+
+// ----------------------------------------------------------------------------
+
 status_t DisplayDevice::orientationToTransfrom(
         int orientation, int w, int h, Transform* tr)
 {
diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h
index 78d44f3847..7efd3bc836 100644
--- a/services/surfaceflinger/DisplayDevice.h
+++ b/services/surfaceflinger/DisplayDevice.h
@@ -91,6 +91,8 @@ public:
     bool                    getSecureLayerVisible() const;
 
     status_t                setOrientation(int orientation);
+    void                    setLayerStack(uint32_t stack);
+
     int                     getOrientation() const { return mOrientation; }
     const Transform&        getTransform() const { return mGlobalTransform; }
     uint32_t                getLayerStack() const { return mLayerStack; }
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 1f9d694930..1c15c82fc9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -857,7 +857,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
                     const DisplayDeviceState& state(curr[i]);
                     if (state.layerStack != draw[i].layerStack) {
                         const sp<DisplayDevice>& disp(getDisplayDevice(state.id));
-                        //disp->setLayerStack(state.layerStack); // FIXME: set layer stack
+                        disp->setLayerStack(state.layerStack);
                     }
                     if (curr[i].orientation != draw[i].orientation) {
                         const sp<DisplayDevice>& disp(getDisplayDevice(state.id));
-- 
2.11.0