Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2d18c60a: Merge "Performance: Activity manager perf unnecessary recalc of oom_adj"

Browse Source 
* commit '2d18c60a0b16c4abac54d373731f4b4afc74e283':
  Performance: Activity manager perf unnecessary recalc of oom_adj
This commit is contained in:
Dianne Hackborn
2012-06-08 18:51:14 -07:00
committed by Android Git Automerger
parent c99e6ee202 2d18c60a0b
commit cddaf4d572
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1757,7 +1757,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (cr.binding != null && cr.binding.service != null
&& cr.binding.service.app != null
&& cr.binding.service.app.lruSeq != mLruSeq) {
updateLruProcessInternalLocked(cr.binding.service.app, oomAdj,
updateLruProcessInternalLocked(cr.binding.service.app, false,
updateActivityTime, i+1);
}
}
@@ -1765,7 +1765,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (app.conProviders.size() > 0) {
for (ContentProviderRecord cpr : app.conProviders.keySet()) {
if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {
updateLruProcessInternalLocked(cpr.proc, oomAdj,
updateLruProcessInternalLocked(cpr.proc, false,
updateActivityTime, i+1);
}
}