Clean up some build warnings
Bug: n/a
Test: n/a
Change-Id: I062e42f14bd1cfafc4a145956fc08ce9c91b2be6
diff --git a/system/hwc3/HostFrameComposer.cpp b/system/hwc3/HostFrameComposer.cpp
index d440b88..4d1167d 100644
--- a/system/hwc3/HostFrameComposer.cpp
+++ b/system/hwc3/HostFrameComposer.cpp
@@ -410,20 +410,21 @@
if (!fallBackToClient) {
for (const auto& layer : layers) {
const auto& layerCompositionType = layer->getCompositionType();
+ const auto layerCompositionTypeString = toString(layerCompositionType);
std::optional<Composition> layerFallBackTo = std::nullopt;
switch (layerCompositionType) {
case Composition::CLIENT:
case Composition::SIDEBAND:
- ALOGV("%s: layer %" PRIu32 " CompositionType %d, fallback to client",
+ ALOGV("%s: layer %" PRIu32 " CompositionType %s, fallback to client",
__FUNCTION__, static_cast<uint32_t>(layer->getId()),
- layerCompositionType);
+ layerCompositionTypeString.c_str());
layerFallBackTo = Composition::CLIENT;
break;
case Composition::CURSOR:
- ALOGV("%s: layer %" PRIu32 " CompositionType %d, fallback to device",
+ ALOGV("%s: layer %" PRIu32 " CompositionType %s, fallback to device",
__FUNCTION__, static_cast<uint32_t>(layer->getId()),
- layerCompositionType);
+ layerCompositionTypeString.c_str());
layerFallBackTo = Composition::DEVICE;
break;
case Composition::INVALID:
@@ -432,8 +433,8 @@
layerFallBackTo = std::nullopt;
break;
default:
- ALOGE("%s: layer %" PRIu32 " has an unknown composition type: %d", __FUNCTION__,
- static_cast<uint32_t>(layer->getId()), layerCompositionType);
+ ALOGE("%s: layer %" PRIu32 " has an unknown composition type: %s", __FUNCTION__,
+ static_cast<uint32_t>(layer->getId()), layerCompositionTypeString.c_str());
}
if (layerFallBackTo == Composition::CLIENT) {
fallBackToClient = true;
@@ -447,7 +448,6 @@
if (fallBackToClient) {
changes.clear();
for (auto& layer : layers) {
- const auto& layerId = layer->getId();
if (layer->getCompositionType() == Composition::INVALID) {
continue;
}
@@ -558,15 +558,18 @@
std::vector<int64_t> releaseLayerIds;
for (auto layer : layers) {
+ const auto& layerCompositionType = layer->getCompositionType();
+ const auto layerCompositionTypeString = toString(layerCompositionType);
+
// TODO: use local var composisitonType to store getCompositionType()
- if (layer->getCompositionType() != Composition::DEVICE &&
- layer->getCompositionType() != Composition::SOLID_COLOR) {
- ALOGE("%s: Unsupported composition types %d layer %u", __FUNCTION__,
- layer->getCompositionType(), (uint32_t)layer->getId());
+ if (layerCompositionType != Composition::DEVICE &&
+ layerCompositionType != Composition::SOLID_COLOR) {
+ ALOGE("%s: Unsupported composition type %s layer %u", __FUNCTION__,
+ layerCompositionTypeString.c_str(), (uint32_t)layer->getId());
continue;
}
// send layer composition command to host
- if (layer->getCompositionType() == Composition::DEVICE) {
+ if (layerCompositionType == Composition::DEVICE) {
releaseLayerIds.emplace_back(layer->getId());
::android::base::unique_fd fence = layer->getBuffer().getFence();
@@ -589,7 +592,7 @@
// solidcolor has no buffer
l->cbHandle = 0;
}
- l->composeMode = (hwc2_composition_t)layer->getCompositionType();
+ l->composeMode = (hwc2_composition_t)layerCompositionType;
l->displayFrame = AsHwcRect(layer->getDisplayFrame());
l->crop = AsHwcFrect(layer->getSourceCrop());
l->blendMode = static_cast<int32_t>(layer->getBlendMode());