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

Commit 7952963f authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "logd: LogBufferElementKey use uint32_t for uid" am: 3fa88d86 am: 41a117db 

am: 842928b4

Change-Id: Ifda61b0876aee10afa89a2d494b24c42137f467d
parents e0fca059 842928b4

logd/LogBuffer.cpp

+3 −4
Original line number Diff line number Diff line
@@ -534,10 +534,9 @@ LogBufferElementCollection::iterator LogBuffer::erase( 
class LogBufferElementKey {

    const union {

        struct {

            uint16_t uid;

            uint32_t uid;

            uint16_t pid;

            uint16_t tid;

            uint16_t padding;

        } __packed;

        uint64_t value;

    } __packed;
@@ -546,8 +545,8 @@ public: 
    LogBufferElementKey(uid_t uid, pid_t pid, pid_t tid):

            uid(uid),

            pid(pid),

            tid(tid),

            padding(0) {

            tid(tid)

    {

    }

    explicit LogBufferElementKey(uint64_t key):value(key) { }