Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 (52245ac7) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -14419,12 +14419,18 @@ public final class ActivityManagerService extends ActivityManagerNative
		app.thread.scheduleTrimMemory(curLevel);
		} 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
		// to help them free memory.
		mMainStack.destroyActivitiesLocked(app, false, "trim");
		}
		}
		}
		app.trimMemoryLevel = curLevel;
		step++;
		if (step >= factor) {