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

Commit 0def690a authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "libmediadrm: fix uuid log width" am: de8e328e am: fc19907b am:... 

Merge "libmediadrm: fix uuid log width" am: de8e328e am: fc19907b am: 8b35aee8 am: 4d0f8f8d am: 95a58eb8

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



Change-Id: If5a8a354d494f71b7438d040d2cd15617e18dcfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f0bd97c 95a58eb8

drm/libmediadrm/interface/mediadrm/DrmUtils.h

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <ctime>

#include <deque>

#include <endian.h>

#include <inttypes.h>

#include <iterator>

#include <mutex>

#include <string>
@@ -105,9 +106,9 @@ template <typename... Args> 
void LogToBuffer(android_LogPriority level, const uint8_t uuid[16], const char *fmt, Args... args) {

    uint64_t uuid2[2] = {};

    std::memcpy(uuid2, uuid, sizeof(uuid2));

    std::string uuidFmt("uuid=[%lx %lx] ");

    std::string uuidFmt("uuid=[%" PRIx64 " %" PRIx64 "] ");

    uuidFmt += fmt;

    LogToBuffer(level, uuidFmt.c_str(), htobe64(uuid2[0]), htobe64(uuid2[1]), args...);

    LogToBuffer(level, uuidFmt.c_str(), betoh64(uuid2[0]), betoh64(uuid2[1]), args...);

}



#ifndef LOG2BE