diff options
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index a4d321dadb1e..df58e83186ac 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -14419,10 +14419,16 @@ public final class ActivityManagerService extends ActivityManagerNative app.thread.scheduleTrimMemory(curLevel); } catch (RemoteException e) { } - if (curLevel >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) { - // For these apps we will also finish their activities - // to help them free memory. - mMainStack.destroyActivitiesLocked(app, false, "trim"); + if (false) { + // For now we won't do this; our memory trimming seems + // to be good enough at this point that destroying + // activities causes more harm than good. + if (curLevel >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE + && app != mHomeProcess && app != mPreviousProcess) { + // For these apps we will also finish their activities + // to help them free memory. + mMainStack.destroyActivitiesLocked(app, false, "trim"); + } } } app.trimMemoryLevel = curLevel; |