commit f752154fb13c6827482b915db817b849c4bc2452
author Mark Salyzyn <salyzyn@google.com> Tue May 12 00:24:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 12 00:24:58 2015 +0000
tree dedb968b2813bfd3722ec9eeeeacefc032fca92f
parent eb0e930ae7b4ad22bfe930c929430840fe5d32be
parent c2df9d9722b72e25ec9cd4c82ddd9bf4cd428787

am 9992aa8a: am ff1f639c: am 80b129f9: Merge "logd: uidToName add dex2oat UID"

* commit '9992aa8add9b64650f07cef3315f03604c206f52':
  logd: uidToName add dex2oat UID

logd/LogStatistics.cpp

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 @@
     }
 
     // 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 @@
                     name = strdup(n);
                 } else if (strcmp(name, n)) {
                     free(name);
-                    return NULL;
+                    name = NULL;
+                    break;
                 }
             }
         }