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 
am: 3fa88d8689

Change-Id: I658b42b503404b1c907c1901dc265accc9b01e61
This commit is contained in:
Mark Salyzyn 2016-12-21 21:49:29 +00:00 • committed by android-build-merger
commit 41a117dbcb
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) { }