diff options
author | Mark Salyzyn <salyzyn@google.com> | 2015-04-29 12:48:45 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2015-05-12 09:55:02 -0700 |
commit | 9bdc0647200bfcd64962a5d2bde39f01f2fd0457 (patch) | |
tree | bea4db6b2534886fa8d0611576e0867781855faa /logd | |
parent | 6de7a06afb3f70abe1517fc55efd1a11110e5197 (diff) | |
download | system_core-9bdc0647200bfcd64962a5d2bde39f01f2fd0457.zip system_core-9bdc0647200bfcd64962a5d2bde39f01f2fd0457.tar.gz system_core-9bdc0647200bfcd64962a5d2bde39f01f2fd0457.tar.bz2 |
logd: uidToName add dex2oat UID
(cherry pick from commit 023f51f360472f6bb9bad495e55cdb32b5411bc5)
- When searching for uidToName from /data/system/packages.list
one must search for the uid % AID_USER;
- If uid % AID_USER is greater than AID_SHARED_GID_START - AID_APP,
then subract it and try again to pick up uidToName.
Change-Id: I24df42957ff7e746fffa5d39484637b1b726b9c0
Diffstat (limited to 'logd')
-rw-r--r-- | logd/LogStatistics.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp index 10f7255..2eab4dd 100644 --- a/logd/LogStatistics.cpp +++ b/logd/LogStatistics.cpp @@ -131,7 +131,11 @@ char *LogStatistics::uidToName(uid_t uid) { } // Parse /data/system/packages.list - char *name = android::uidToName(uid); + uid_t userId = uid % AID_USER; + char *name = android::uidToName(userId); + if (!name && (userId > (AID_SHARED_GID_START - AID_APP))) { + name = android::uidToName(userId - (AID_SHARED_GID_START - AID_APP)); + } if (name) { return name; } @@ -149,7 +153,8 @@ char *LogStatistics::uidToName(uid_t uid) { name = strdup(n); } else if (strcmp(name, n)) { free(name); - return NULL; + name = NULL; + break; } } } |