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

Merge "Consolidate ActivityStack#finishCurrentActivityLocked checking"

Browse Source 
am: 1b90887629

Change-Id: Icbcdb2d841fd52306f067c7606b78918c6f70894
This commit is contained in:
wilsonshih
2019-10-30 08:05:57 -07:00
committed by android-build-merger
parent 7f46f8631f 1b90887629
commit 02e3db1499
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4112,9 +4112,13 @@ class ActivityStack extends ConfigurationContainer {
final ActivityDisplay display = getDisplay(); final ActivityDisplay display = getDisplay();
final ActivityRecord next = display.topRunningActivity(true /* considerKeyguardState */); final ActivityRecord next = display.topRunningActivity(true /* considerKeyguardState */);
final boolean isFloating = r.getConfiguration().windowConfiguration.tasksAreFloating(); final boolean isFloating = r.getConfiguration().windowConfiguration.tasksAreFloating();
// isNextNotYetVisible is to check if the next activity is invisible, or it has been
if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible) // requested to be invisible but its windows haven't reported as invisible. If so, it
&& next != null && !next.nowVisible && !isFloating) { // implied that the current finishing activity should be added into stopping list rather
// than destroying it immediately.
final boolean isNextNotYetVisible = next != null && (!next.nowVisible || !next.visible);
if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible) && isNextNotYetVisible
&& !isFloating) {
if (!mStackSupervisor.mStoppingActivities.contains(r)) { if (!mStackSupervisor.mStoppingActivities.contains(r)) {
addToStopping(r, false /* scheduleIdle */, false /* idleDelayed */, addToStopping(r, false /* scheduleIdle */, false /* idleDelayed */,
"finishCurrentActivityLocked"); "finishCurrentActivityLocked");