liblog: logprint use uid name if length less then 5

Bug: 25996918
Change-Id: Id882978b7b0b439e39bedeafc39edf80892f0317
This commit is contained in:
Mark Salyzyn 2015-12-08 09:15:06 -08:00
parent 90e7af30a5
commit 2aa510e8b4
1 changed files with 16 additions and 1 deletions

View File

@ -32,6 +32,7 @@
#include <cutils/list.h>
#include <log/logd.h>
#include <log/logprint.h>
#include <private/android_filesystem_config.h>
#define MS_PER_NSEC 1000000
#define US_PER_NSEC 1000
@ -1328,7 +1329,21 @@ char *android_log_formatLogLine (
uid[0] = '\0';
if (p_format->uid_output) {
if (entry->uid >= 0) {
snprintf(uid, sizeof(uid), "%5d:", entry->uid);
const struct android_id_info *info = android_ids;
size_t i;
for (i = 0; i < android_id_count; ++i) {
if (info->aid == (unsigned int)entry->uid) {
break;
}
++info;
}
if ((i < android_id_count) && (strlen(info->name) <= 5)) {
snprintf(uid, sizeof(uid), "%5s:", info->name);
} else {
// Not worth parsing package list, names all longer than 5
snprintf(uid, sizeof(uid), "%5d:", entry->uid);
}
} else {
snprintf(uid, sizeof(uid), " ");
}