[Composer] Fix compiler warnings
When included by SurfaceFlinger, there were various warnings in the
ComposerCommandBuffer headers for conversions with -Wconversion enabled
that necessitated disabling that warning for these headers. These have
been fixed by adding explicit static_casts to the needed integer type.
In addition "#warn" was not a valid preprocessor directive, as used at
the top of each file if LOG_TAG is not defined. This was replaced by a
correct "#warning" directive.
Finally, there were also some unused includes reported by in-editor
clangd checks. Those have been removed.
Flag: EXEMPT build and lint warnings only
Bug: None
Test: Builds
Change-Id: I4918a115fab76c9cebee1f9fcfbb841e6cef6690
diff --git a/graphics/composer/2.2/utils/command-buffer/include/composer-command-buffer/2.2/ComposerCommandBuffer.h b/graphics/composer/2.2/utils/command-buffer/include/composer-command-buffer/2.2/ComposerCommandBuffer.h
index cd47374..5b3a433 100644
--- a/graphics/composer/2.2/utils/command-buffer/include/composer-command-buffer/2.2/ComposerCommandBuffer.h
+++ b/graphics/composer/2.2/utils/command-buffer/include/composer-command-buffer/2.2/ComposerCommandBuffer.h
@@ -17,19 +17,13 @@
#pragma once
#ifndef LOG_TAG
-#warn "ComposerCommandBuffer.h included without LOG_TAG"
+#warning "ComposerCommandBuffer.h included without LOG_TAG"
#endif
//#define LOG_NDEBUG 0
-#include <algorithm>
-#include <limits>
-#include <memory>
#include <vector>
-#include <inttypes.h>
-#include <string.h>
-
#include <android/hardware/graphics/composer/2.2/IComposer.h>
#include <android/hardware/graphics/composer/2.2/IComposerClient.h>
#include <fmq/MessageQueue.h>
@@ -82,7 +76,7 @@
void setLayerPerFrameMetadata(const hidl_vec<IComposerClient::PerFrameMetadata>& metadataVec) {
beginCommand(IComposerClient::Command::SET_LAYER_PER_FRAME_METADATA,
- metadataVec.size() * 2);
+ static_cast<uint16_t>(metadataVec.size() * 2));
for (const auto& metadata : metadataVec) {
writeSigned(static_cast<int32_t>(metadata.key));
writeFloat(metadata.value);
diff --git a/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h b/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
index 1a9276c..46d8d4a 100644
--- a/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
+++ b/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
@@ -17,7 +17,7 @@
#pragma once
#ifndef LOG_TAG
-#warn "ComposerCommandBuffer.h included without LOG_TAG"
+#warning "ComposerCommandBuffer.h included without LOG_TAG"
#endif
//#define LOG_NDEBUG 0
@@ -46,7 +46,7 @@
public:
void setLayerPerFrameMetadata(const hidl_vec<IComposerClient::PerFrameMetadata>& metadataVec) {
beginCommand(IComposerClient::Command::SET_LAYER_PER_FRAME_METADATA,
- metadataVec.size() * 2);
+ static_cast<uint16_t>(metadataVec.size() * 2));
for (const auto& metadata : metadataVec) {
writeSigned(static_cast<int32_t>(metadata.key));
writeFloat(metadata.value);
diff --git a/graphics/composer/2.4/utils/command-buffer/include/composer-command-buffer/2.4/ComposerCommandBuffer.h b/graphics/composer/2.4/utils/command-buffer/include/composer-command-buffer/2.4/ComposerCommandBuffer.h
index e981da6..064fc57 100644
--- a/graphics/composer/2.4/utils/command-buffer/include/composer-command-buffer/2.4/ComposerCommandBuffer.h
+++ b/graphics/composer/2.4/utils/command-buffer/include/composer-command-buffer/2.4/ComposerCommandBuffer.h
@@ -17,7 +17,7 @@
#pragma once
#ifndef LOG_TAG
-#warn "ComposerCommandBuffer.h included without LOG_TAG"
+#warning "ComposerCommandBuffer.h included without LOG_TAG"
#endif
//#define LOG_NDEBUG 0
@@ -63,16 +63,17 @@
beginCommand(IComposerClient::Command::SET_LAYER_GENERIC_METADATA,
static_cast<uint16_t>(commandSize));
- write(key.size());
- writeBlob(key.size(), reinterpret_cast<const unsigned char*>(key.c_str()));
+ write(static_cast<uint32_t>(key.size()));
+ writeBlob(static_cast<uint32_t>(key.size()),
+ reinterpret_cast<const unsigned char*>(key.c_str()));
write(mandatory);
- write(value.size());
- writeBlob(value.size(), value.data());
+ write(static_cast<uint32_t>(value.size()));
+ writeBlob(static_cast<uint32_t>(value.size()), value.data());
endCommand();
}
protected:
- uint32_t sizeToElements(uint32_t size) { return (size + 3) / 4; }
+ uint32_t sizeToElements(size_t size) { return static_cast<uint32_t>((size + 3) / 4); }
};
// This class helps parse a command queue. Note that all sizes/lengths are in