Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24ec8703 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app... 

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

* commit '52245ac7':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
parents 83f79c90 52245ac7

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) {