diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-02-23 01:27:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-23 01:27:50 +0000 |
| commit | 128230c6ea72fb06b70a694d2547bb64d47d6e07 (patch) | |
| tree | c0500b1cd097ce8ae177c2a597f57f38eaaef2c6 | |
| parent | 8a31fe9fcc7f29eb4f43c8837ae49645cc251e48 (diff) | |
| parent | d0b3b9b83b7071e63b46040c905d2112106c6224 (diff) | |
| download | goldfish-opengl-128230c6ea72fb06b70a694d2547bb64d47d6e07.tar.gz | |
Replace basic_string_view<uint8_t> with span am: d0b3b9b83b
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2964223
Change-Id: Ia7207cb9da3f4d166ba5cb4885544926bb64e833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/hwc3/DrmConnector.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/hwc3/DrmConnector.cpp b/system/hwc3/DrmConnector.cpp index 0c8f6584..dac64058 100644 --- a/system/hwc3/DrmConnector.cpp +++ b/system/hwc3/DrmConnector.cpp @@ -16,6 +16,8 @@ #include "DrmConnector.h" +#include <span> + namespace aidl::android::hardware::graphics::composer3::impl { namespace { @@ -98,13 +100,13 @@ bool DrmConnector::loadEdid(::android::base::borrowed_fd drmFd) { drmModeFreePropertyBlob(blob); - using byte_view = std::basic_string_view<uint8_t>; + using byte_view = std::span<const uint8_t>; constexpr size_t kEdidDescriptorOffset = 54; constexpr size_t kEdidDescriptorLength = 18; - byte_view edid(mEdid->data(), mEdid->size()); - edid.remove_prefix(kEdidDescriptorOffset); + byte_view edid(*mEdid); + edid = edid.subspan(kEdidDescriptorOffset); byte_view descriptor(edid.data(), kEdidDescriptorLength); if (descriptor[0] == 0 && descriptor[1] == 0) { |