Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

Browse Source 
* commit '2a857f00110c448d702ffa4ee998dfd78688fa21':
  Move visibleBehind activities into stop state when sleeping/powerDown
This commit is contained in:
Wale Ogunwale
2015-05-12 17:47:25 +00:00
committed by Android Git Automerger
parent d9a87d7c74 2a857f0011
commit eadffbc6fb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -748,6 +748,14 @@ final class ActivityStack {
return true; return true;
} }
if (hasVisibleBehindActivity()) {
// Stop visible behind activity before going to sleep.
final ActivityRecord r = mActivityContainer.mActivityDisplay.mVisibleBehindActivity;
mStackSupervisor.mStoppingActivities.add(r);
if (DEBUG_STATES) Slog.v(TAG, "Sleep still waiting to stop visible behind " + r);
return true;
}
return false; return false;
} }
@@ -1007,7 +1015,7 @@ final class ActivityStack {
// the current instance before starting the new one. // the current instance before starting the new one.
if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Destroying after pause: " + prev); if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Destroying after pause: " + prev);
destroyActivityLocked(prev, true, "pause-config"); destroyActivityLocked(prev, true, "pause-config");
} else if (!hasVisibleBehindActivity()) { } else if (!hasVisibleBehindActivity() || mService.isSleepingOrShuttingDown()) {
// If we were visible then resumeTopActivities will release resources before // If we were visible then resumeTopActivities will release resources before
// stopping. // stopping.
mStackSupervisor.mStoppingActivities.add(prev); mStackSupervisor.mStoppingActivities.add(prev);