summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-08-13 20:45:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-08-13 20:45:43 +0000
commit501c486606a222c34cfd994bc6632c0a85ff9da0 (patch)
treeba3fcb6ab4dca53e4f153c16af29029662caabaa /libs/gui/SurfaceComposerClient.cpp
parent8ca257f9e727555edb3531bbdde7b684d9016033 (diff)
parent29fa146d8d745cee950a1ed82ddb500fc6d6c771 (diff)
Merge "SF: Consolidate layer-to-output filtering"
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r--libs/gui/SurfaceComposerClient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 2e25ae4d23..05554cab94 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -1095,7 +1095,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha
}
SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setLayerStack(
- const sp<SurfaceControl>& sc, uint32_t layerStack) {
+ const sp<SurfaceControl>& sc, ui::LayerStack layerStack) {
layer_state_t* s = getLayerState(sc);
if (!s) {
mStatus = BAD_INDEX;
@@ -1760,7 +1760,7 @@ status_t SurfaceComposerClient::Transaction::setDisplaySurface(const sp<IBinder>
}
void SurfaceComposerClient::Transaction::setDisplayLayerStack(const sp<IBinder>& token,
- uint32_t layerStack) {
+ ui::LayerStack layerStack) {
DisplayState& s(getDisplayState(token));
s.layerStack = layerStack;
s.what |= DisplayState::eLayerStackChanged;