openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "logd: LogBufferElementKey use uint32_t for uid" am: 3fa88d8689 

am: 41a117dbcb

Change-Id: I26948cf98f7bbd4383e79e09bdde65c612dabadf
This commit is contained in:
Mark Salyzyn 2016-12-21 21:53:39 +00:00 committed by android-build-merger
parent 0209a3cd07 41a117dbcb
commit 842928b4bd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
logd/LogBuffer.cpp
View File

@ -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) { }