diff options
| -rw-r--r-- | libs/dumputils/dump_utils.cpp | 5 | ||||
| -rw-r--r-- | libs/renderengine/skia/Cache.cpp | 3 | ||||
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Predictor.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libs/dumputils/dump_utils.cpp b/libs/dumputils/dump_utils.cpp index f4cf11edb6..a9bd11e41d 100644 --- a/libs/dumputils/dump_utils.cpp +++ b/libs/dumputils/dump_utils.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ #include <set> +#include <utility> #include <android-base/file.h> #include <android-base/parseint.h> @@ -115,7 +116,7 @@ static const std::vector<std::string> aidl_interfaces_to_dump { /* list of extra hal interfaces to dump containing process during native dumps */ // This is filled when dumpstate is called. -static std::set<const std::string> extra_hal_interfaces_to_dump; +static std::set<std::string> extra_hal_interfaces_to_dump; static void read_extra_hals_to_dump_from_property() { // extra hals to dump are already filled @@ -129,7 +130,7 @@ static void read_extra_hals_to_dump_from_property() { if (trimmed_token.length() == 0) { continue; } - extra_hal_interfaces_to_dump.insert(trimmed_token); + extra_hal_interfaces_to_dump.insert(std::move(trimmed_token)); } } diff --git a/libs/renderengine/skia/Cache.cpp b/libs/renderengine/skia/Cache.cpp index abe0d9b0a6..7b3b176d79 100644 --- a/libs/renderengine/skia/Cache.cpp +++ b/libs/renderengine/skia/Cache.cpp @@ -718,8 +718,7 @@ void Cache::primeShaderCache(SkiaRenderEngine* renderengine, bool shouldPrimeUlt const auto externalTexture = std::make_shared<impl::ExternalTexture>(externalBuffer, *renderengine, impl::ExternalTexture::Usage::READABLE); - std::vector<const std::shared_ptr<ExternalTexture>> textures = - {srcTexture, externalTexture}; + std::vector<std::shared_ptr<ExternalTexture>> textures = {srcTexture, externalTexture}; // Another external texture with a different pixel format triggers useIsOpaqueWorkaround. // It doesn't have to be f16, but it can't be the usual 8888. diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Predictor.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Predictor.h index 6be673597e..9c0e072f2e 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Predictor.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Predictor.h @@ -92,15 +92,15 @@ public: } private: - std::vector<const LayerState> copyLayers(const std::vector<const LayerState*>& layers) { - std::vector<const LayerState> copiedLayers; + std::vector<LayerState> copyLayers(const std::vector<const LayerState*>& layers) { + std::vector<LayerState> copiedLayers; copiedLayers.reserve(layers.size()); std::transform(layers.cbegin(), layers.cend(), std::back_inserter(copiedLayers), [](const LayerState* layerState) { return *layerState; }); return copiedLayers; } - std::vector<const LayerState> mLayers; + std::vector<LayerState> mLayers; // TODO(b/180976743): Tune kMaxDifferingFields constexpr static int kMaxDifferingFields = 6; |