Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8843ce55 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "libmediadrm logging: avoid unaligned memory" into tm-dev am: 73fe3dc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17059617

Change-Id: Ia61764834f0f4a8af2386beee8a51b17cf4046b1
parents f50a6128 73fe3dc8
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@
#include <chrono>
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <ctime>
#include <deque>
#include <endian.h>
@@ -100,7 +101,8 @@ void LogToBuffer(android_LogPriority level, const char *fmt, Args... args) {

template <typename... Args>
void LogToBuffer(android_LogPriority level, const uint8_t uuid[16], const char *fmt, Args... args) {
    const uint64_t* uuid2 = reinterpret_cast<const uint64_t*>(uuid);
    uint64_t uuid2[2] = {};
    std::memcpy(uuid2, uuid, sizeof(uuid2));
    std::string uuidFmt("uuid=[%lx %lx] ");
    uuidFmt += fmt;
    LogToBuffer(level, uuidFmt.c_str(), htobe64(uuid2[0]), htobe64(uuid2[1]), args...);