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

Merge "Add an event log for when the memfactor changes." into nyc-dev

Browse Source
This commit is contained in:
Joe Onorato
2016-04-19 20:49:30 +00:00
committed by Android (Google) Code Review
parent 4c4afedfc5 1dbff801ae
commit a7f46b3ca6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -20103,6 +20103,9 @@ public final class ActivityManagerService extends ActivityManagerNative
if (DEBUG_OOM_ADJ) Slog.d(TAG_OOM_ADJ, "Keeping last mem factor!"); if (DEBUG_OOM_ADJ) Slog.d(TAG_OOM_ADJ, "Keeping last mem factor!");
} }
} }
if (memFactor != mLastMemoryLevel) {
EventLogTags.writeAmMemFactor(memFactor, mLastMemoryLevel);
}
mLastMemoryLevel = memFactor; mLastMemoryLevel = memFactor;
mLastNumProcesses = mLruProcesses.size(); mLastNumProcesses = mLruProcesses.size();
boolean allChanged = mProcessStats.setMemFactorLocked(memFactor, !isSleeping(), now); boolean allChanged = mProcessStats.setMemFactorLocked(memFactor, !isSleeping(), now);

4
services/core/java/com/android/server/am/EventLogTags.logtags
View File

@@ -108,3 +108,7 @@ option java_package com.android.server.am
30048 am_stop_activity (User|1|5),(Token|1|5),(Component Name|3) 30048 am_stop_activity (User|1|5),(Token|1|5),(Component Name|3)
# The activity's onStop has been called. # The activity's onStop has been called.
30049 am_on_stop_called (User|1|5),(Component Name|3),(Reason|3) 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)