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

Merge "Fix starting window did not transfer to starting activity." into rvc-dev am: 94be6df39d am: a2cba15913

Browse Source 
Change-Id: I0f1a54af22fece0a69801126faef97a905d18c41
This commit is contained in:
Automerger Merge Worker
2020-03-10 15:41:47 +00:00
parent 765434716e a2cba15913
commit eb1fd893c7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2393,8 +2393,10 @@ class ActivityStack extends Task {
} }
Task task = null; Task task = null;
if (!newTask && isOrhasTask) { if (!newTask && isOrhasTask) {
// Starting activity cannot be occluding activity, otherwise starting window could be
// remove immediately without transferring to starting activity.
final ActivityRecord occludingActivity = getActivity( final ActivityRecord occludingActivity = getActivity(
(ar) -> !ar.finishing && ar.occludesParent(), true, rTask); (ar) -> !ar.finishing && ar.occludesParent(), true, r);
if (occludingActivity != null) { if (occludingActivity != null) {
// Here it is! Now, if this is not yet visible (occluded by another task) to the // Here it is! Now, if this is not yet visible (occluded by another task) to the
// user, then just add it without starting; it will get started when the user // user, then just add it without starting; it will get started when the user