Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31e85fad authored by Björn Davidsson's avatar Björn Davidsson Committed by Steve Kondik
Browse files

Performance: Activity manager perf unnecessary recalc of oom_adj 

If an activity has bound service content providers,
updateLruProcessInternalLocked will be called recursively with
the oomAdj flag set, resulting in several recalculations of oomAdj
with unchanged data. Doing it at the end of the top level call to
updateLruProcessInternalLocked is sufficient.

Change-Id: I95e27011e1d3519f256a9bd756cbb18d43e8db29
parent c7c028eb

services/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1674,7 +1674,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);

                }

            }
@@ -1682,7 +1682,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        if (app.conProviders.size() > 0) {

            for (ContentProviderRecord cpr : app.conProviders.keySet()) {

                if (cpr.app != null && cpr.app.lruSeq != mLruSeq) {

                    updateLruProcessInternalLocked(cpr.app, oomAdj,

                    updateLruProcessInternalLocked(cpr.app, false,

                            updateActivityTime, i+1);

                }

            }