diff options
| author | 2016-04-19 20:49:30 +0000 | |
|---|---|---|
| committer | 2016-04-19 20:49:32 +0000 | |
| commit | a7f46b3ca6aa784b1456735c421922fd4c31626d (patch) | |
| tree | e4766c96accb6c19612e495ebc70e6e874f44402 | |
| parent | 4c4afedfc5134558c1f674c1fc8f41260e07bdeb (diff) | |
| parent | 1dbff801aeac52a4525f085d1346cc8741c00d30 (diff) | |
Merge "Add an event log for when the memfactor changes." into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/EventLogTags.logtags | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5d83a6e5ac97..6138ef43d073 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -20103,6 +20103,9 @@ public final class ActivityManagerService extends ActivityManagerNative if (DEBUG_OOM_ADJ) Slog.d(TAG_OOM_ADJ, "Keeping last mem factor!"); } } + if (memFactor != mLastMemoryLevel) { + EventLogTags.writeAmMemFactor(memFactor, mLastMemoryLevel); + } mLastMemoryLevel = memFactor; mLastNumProcesses = mLruProcesses.size(); boolean allChanged = mProcessStats.setMemFactorLocked(memFactor, !isSleeping(), now); diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags index 2329b2f82bb7..2762df6b8ad5 100644 --- a/services/core/java/com/android/server/am/EventLogTags.logtags +++ b/services/core/java/com/android/server/am/EventLogTags.logtags @@ -108,3 +108,7 @@ option java_package com.android.server.am 30048 am_stop_activity (User|1|5),(Token|1|5),(Component Name|3) # The activity's onStop has been called. 30049 am_on_stop_called (User|1|5),(Component Name|3),(Reason|3) + +# Report changing memory conditions (Values are ProcessStats.ADJ_MEM_FACTOR* constants) +30050 am_mem_factor (Current|1|5),(Previous|1|5) + |