am 80b129f9: Merge "logd: uidToName add dex2oat UID"

* commit '80b129f9f08ce9d8b4e315a4413dda61e5dbdd75':
  logd: uidToName add dex2oat UID
This commit is contained in:
Mark Salyzyn 2015-05-12 00:01:53 +00:00 committed by Android Git Automerger
commit ff1f639c80

View file

@ -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;
}
}
}