commit 09bb2d6c9708a2f390ec77dc3a414300fb9a0c55
author Mark Salyzyn <salyzyn@google.com> Thu Jul 14 16:55:20 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Jul 15 14:37:04 2016 -0700
tree 5e3d323cad31a22819dac67203557d17b5174c5b
parent 858f7f9875c484c36b95f1a8d63593049991a018

logd: rename sort() for pids to sortPids()

Bug: 30118730
Change-Id: If992b53b52a7470427fbe82abb93c95c1b2dc57a

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