diff options
| author | 2019-03-18 07:52:00 +0000 | |
|---|---|---|
| committer | 2019-03-18 07:52:00 +0000 | |
| commit | f7a0b28443d8997f19892cc3806e6b7a94150aab (patch) | |
| tree | 1bc9d20bf6c0f76bad5f3e69ea087a9c721d44d7 | |
| parent | bed3db4d0b888240a770bb57fa270569041f3994 (diff) | |
| parent | 885c21b09478d2bacf092c9f1304a07e9c8a1201 (diff) | |
Merge "Log the correct oom_adj when compacting apps."
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/AppCompactor.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 3246d19e6202..b8e8fdc6a9f2 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -4913,7 +4913,7 @@ message AppCompacted { // since boot, not including sleep (see SystemClock.uptimeMillis()). optional int64 last_compact_timestamp_ms_since_boot = 14; - // The oom_score_adj at the time of compaction. + // The "setAdj" (i.e. previous) oom_score_adj at the time of compaction. optional int32 oom_score_adj = 15; // The process state at the time of compaction. diff --git a/services/core/java/com/android/server/am/AppCompactor.java b/services/core/java/com/android/server/am/AppCompactor.java index 1f2116065bc1..438538ffde88 100644 --- a/services/core/java/com/android/server/am/AppCompactor.java +++ b/services/core/java/com/android/server/am/AppCompactor.java @@ -211,7 +211,7 @@ public final class AppCompactor { mPendingCompactionProcesses.add(app); mCompactionHandler.sendMessage( mCompactionHandler.obtainMessage( - COMPACT_PROCESS_MSG, app.curAdj, app.setProcState)); + COMPACT_PROCESS_MSG, app.setAdj, app.setProcState)); } @GuardedBy("mAm") @@ -220,7 +220,7 @@ public final class AppCompactor { mPendingCompactionProcesses.add(app); mCompactionHandler.sendMessage( mCompactionHandler.obtainMessage( - COMPACT_PROCESS_MSG, app.curAdj, app.setProcState)); + COMPACT_PROCESS_MSG, app.setAdj, app.setProcState)); } |