summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabien Sanglard <sanglardf@google.com> 2017-03-07 22:25:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-03-07 22:25:02 +0000
commit10012f0ce0c06ad56459a41aabef682d0b1b06d0 (patch)
tree3a69926add11a0a5755651ebab376ecfb3349e34
parent56a8f942731ad34a8e85a9a0fb84f1be2ead5541 (diff)
parent8226051f627aa976700885cda28c26c5a5b8bc7b (diff)
Merge "[SurfaceFlinger] Comment SurfaceFlinger HWC2"
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0dc3034e4e..46f5a1fbf3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1594,6 +1594,9 @@ void SurfaceFlinger::rebuildLayerStacks() {
nullptr);
}
} else {
+ // WM changes displayDevice->layerStack upon sleep/awake.
+ // Here we make sure we delete the HWC layers even if
+ // WM changed their layer stack.
layer->setHwcLayer(displayDevice->getHwcDisplayId(),
nullptr);
}