ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logd: LogBufferElementKey use uint32_t for uid"

Browse source
This commit is contained in:
Treehugger Robot 2016-12-21 21:40:10 +00:00 • committed by Gerrit Code Review
commit 3fa88d8689
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 { class LogBufferElementKey {
const union { const union {
struct { struct {
uint16_t uid; uint32_t uid;
uint16_t pid; uint16_t pid;
uint16_t tid; uint16_t tid;
uint16_t padding;
} __packed; } __packed;
uint64_t value; uint64_t value;
} __packed; } __packed;
@ -546,8 +545,8 @@ public:
LogBufferElementKey(uid_t uid, pid_t pid, pid_t tid): LogBufferElementKey(uid_t uid, pid_t pid, pid_t tid):
uid(uid), uid(uid),
pid(pid), pid(pid),
tid(tid), tid(tid)
padding(0) { {
} }
explicit LogBufferElementKey(uint64_t key):value(key) { } explicit LogBufferElementKey(uint64_t key):value(key) { }