Use ui::LayerStack
Bug: 182939859
Test: Build
Change-Id: I4658471996939713a6330a9c4a7d05cf4c91833a
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 3109c5c..5c75d14 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -448,16 +448,15 @@
// In the case of multi-display, boot animation shows on the specified displays
// in addition to the primary display
- auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
- constexpr uint32_t LAYER_STACK = 0;
- for (auto id : physicalDisplayIds) {
+ const auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
+ for (const auto id : physicalDisplayIds) {
if (std::find(ids.begin(), ids.end(), id) != ids.end()) {
- sp<IBinder> token = SurfaceComposerClient::getPhysicalDisplayToken(id);
- if (token != nullptr)
- t.setDisplayLayerStack(token, LAYER_STACK);
+ if (const auto token = SurfaceComposerClient::getPhysicalDisplayToken(id)) {
+ t.setDisplayLayerStack(token, ui::DEFAULT_LAYER_STACK);
+ }
}
}
- t.setLayerStack(control, LAYER_STACK);
+ t.setLayerStack(control, ui::DEFAULT_LAYER_STACK);
}
t.setLayer(control, 0x40000000)
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index f63c0e5..b9233a0 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -814,7 +814,7 @@
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);
- transaction->setLayerStack(ctrl, layerStack);
+ transaction->setLayerStack(ctrl, ui::LayerStack::fromValue(layerStack));
}
static void nativeSetShadowRadius(JNIEnv* env, jclass clazz, jlong transactionObj,
@@ -1013,7 +1013,7 @@
{
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
- transaction->setDisplayLayerStack(token, layerStack);
+ transaction->setDisplayLayerStack(token, ui::LayerStack::fromValue(layerStack));
}
}
diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp
index acd8bce..12c6a32 100644
--- a/libs/input/SpriteController.cpp
+++ b/libs/input/SpriteController.cpp
@@ -169,7 +169,8 @@
// If surface is a new one, we have to set right layer stack.
if (update.surfaceChanged || update.state.dirty & DIRTY_DISPLAY_ID) {
- t.setLayerStack(update.state.surfaceControl, update.state.displayId);
+ t.setLayerStack(update.state.surfaceControl,
+ ui::LayerStack::fromValue(update.state.displayId));
needApplyTransaction = true;
}
}