drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1

Browse Source
This commit is contained in:
Dianne Hackborn
2011-12-05 19:07:52 -08:00
committed by Android (Google) Code Review
parent f66664a50e 77eaaf04c6
commit 52245ac7c4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -14419,12 +14419,18 @@ public final class ActivityManagerService extends ActivityManagerNative
app.thread.scheduleTrimMemory(curLevel); app.thread.scheduleTrimMemory(curLevel);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
if (curLevel >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) { 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 // For these apps we will also finish their activities
// to help them free memory. // to help them free memory.
mMainStack.destroyActivitiesLocked(app, false, "trim"); mMainStack.destroyActivitiesLocked(app, false, "trim");
} }
} }
}
app.trimMemoryLevel = curLevel; app.trimMemoryLevel = curLevel;
step++; step++;
if (step >= factor) { if (step >= factor) {