commit 40ad9a0f172532d291924e6bc9b556d7ff9c22f3
author Mark Salyzyn <salyzyn@google.com> Fri Jul 15 22:57:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 15 22:57:56 2016 +0000
tree 10c33a75ba88de104857d9792fd1fa51a24528fb
parent c81f2cc115ca259e55308eb1f5b31b032f809b8d
parent 56c23e63d49843e8fd2984476506b21a15b38b39

Merge changes If992b53b,Ieab60fd1 am: 7c50033e9f am: 11b2dbca15 am: 64bad84ece
am: 866327f751

Change-Id: I81b84207ed931e198c41f5dd420cafcaa9e1d4c5

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index db65978..e5f9b41 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -573,8 +573,8 @@
 
             if ((worst == AID_SYSTEM) && mPrune.worstPidOfSystemEnabled()) {
                 // begin scope of PID sorted list
-                std::unique_ptr<const PidEntry *[]> sorted = stats.sort(
-                    worst, (pid_t)0, 2, id, worst);
+                std::unique_ptr<const PidEntry *[]> sorted = stats.sortPids(
+                    worst, (pid_t)0, 2, id);
                 if (sorted.get() && sorted[0] && sorted[1]) {
                     worstPid = sorted[0]->getKey();
                     second_worst_sizes = worst_sizes

logd/LogStatistics.h

diff --git a/logd/LogStatistics.h b/logd/LogStatistics.h
index b32c27d..52f1d5b 100644
--- a/logd/LogStatistics.h
+++ b/logd/LogStatistics.h
@@ -455,8 +455,8 @@
                                              size_t len, log_id id) {
         return uidTable[id].sort(uid, pid, len);
     }
-    std::unique_ptr<const PidEntry *[]> sort(uid_t uid, pid_t pid,
-                                             size_t len, log_id id, uid_t) {
+    std::unique_ptr<const PidEntry *[]> sortPids(uid_t uid, pid_t pid,
+                                             size_t len, log_id id) {
         return pidSystemTable[id].sort(uid, pid, len);
     }
 

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index 19946b7..1f54677 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -212,7 +212,7 @@
 }
 
 static int fdDmesg = -1;
-void inline android::prdebug(const char *fmt, ...) {
+void android::prdebug(const char *fmt, ...) {
     if (fdDmesg < 0) {
         return;
     }