am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev

* commit '68fbd6a4968eb6e5f3d74f471387c5e62981fba2':
  Use process state to filter >= UI_HIDDEN
This commit is contained in:
John Reck
2015-07-25 00:53:01 +00:00
committed by Android Git Automerger

View File

@@ -3658,7 +3658,7 @@ public final class ActivityManagerService extends ActivityManagerNative
}
if (app.trimMemoryLevel < level && app.thread != null &&
(level < ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN ||
app.trimMemoryLevel >= ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)) {
app.curProcState >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND)) {
try {
app.thread.scheduleTrimMemory(level);
app.trimMemoryLevel = level;