ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I38c76bb2,I81a55e92

Browse source 
* changes:
  logd: clear all from non system user status request
  logd: crash in prune mLastWorstPidOfSystem
This commit is contained in:
Treehugger Robot 2016-09-02 17:31:02 +00:00 • committed by Gerrit Code Review
commit 3aaca7dd60
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
logd/LogBuffer.cpp
View file

@ -508,7 +508,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
LogBufferElementCollection::iterator it; LogBufferElementCollection::iterator it;
if (caller_uid != AID_ROOT) { if (caller_uid != AID_ROOT) {
// Only here if clearAll condition (pruneRows == ULONG_MAX) // Only here if clear all request from non system source, so chatty
// filter logistics is not required.
it = mLastSet[id] ? mLast[id] : mLogElements.begin(); it = mLastSet[id] ? mLast[id] : mLogElements.begin();
while (it != mLogElements.end()) { while (it != mLogElements.end()) {
LogBufferElement *element = *it; LogBufferElement *element = *it;
@ -534,7 +535,9 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
} }
it = erase(it); it = erase(it);
pruneRows--; if (--pruneRows == 0) {
break;
}
} }
LogTimeEntry::unlock(); LogTimeEntry::unlock();
return busy; return busy;
@ -678,7 +681,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
&& ((!gc && (element->getPid() == worstPid)) && ((!gc && (element->getPid() == worstPid))
|| (mLastWorstPidOfSystem[id].find(element->getPid()) || (mLastWorstPidOfSystem[id].find(element->getPid())
== mLastWorstPidOfSystem[id].end()))) { == mLastWorstPidOfSystem[id].end()))) {
mLastWorstPidOfSystem[id][key] = it; mLastWorstPidOfSystem[id][element->getPid()] = it;
} }
if ((!gc && !worstPid && (key == worst)) if ((!gc && !worstPid && (key == worst))
|| (mLastWorst[id].find(key) == mLastWorst[id].end())) { || (mLastWorst[id].find(key) == mLastWorst[id].end())) {