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

Do not add the finishing Activity to mNoHistoryActivities

Browse Source 
The resumed activity is added to mNoHistoryActiviyies while start
pausing the currently resumed activity. The activity in pending
finish state should be ignored while pausing the activity.

Bug: 200159293
Test: atest ActivityStarterTests
Change-Id: I396b115d340916c5a89019fa9f2cd250bfaee0f8
This commit is contained in:
Jeff Chang
2021-09-27 18:58:34 +08:00
parent f7f93694ae
commit e2c24bb69e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -1387,7 +1387,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
ProtoLog.v(WM_DEBUG_STATES, "Moving to PAUSING: %s", prev);
mPausingActivity = prev;
mLastPausedActivity = prev;
if (prev.isNoHistory() && !mTaskSupervisor.mNoHistoryActivities.contains(prev)) {
if (!prev.finishing && prev.isNoHistory()
&& !mTaskSupervisor.mNoHistoryActivities.contains(prev)) {
mTaskSupervisor.mNoHistoryActivities.add(prev);
}
prev.setState(PAUSING, "startPausingLocked");