commit | 088f4a89489a6dc9654ab70d90a283553a7efe0f | [log] [tgz] |
---|---|---|
author | Louis Chang <louischang@google.com> | Fri Mar 15 03:03:39 2024 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Mar 20 01:14:31 2024 +0000 |
tree | 32855537750280a680ca673a47d2854ffe6dd154 | |
parent | dd507f38eaf6262cff184785489f251b68001c97 [diff] |
Fix MixedDeviceOwnerTest test failure NullPointerException was thrown while running the test because the top activity of the most recent task is null. This is a regression caused by commit 1ff574d. It happens when adding a recent task because of resuming the next activity while the top-most activity finishes (the activities are in two different Tasks). The finishing task still has the higher z-ordering in the WM hierarchy which therefore was remained be the most recent task. The finishing task should be excluded and the most recent task should be the one that is resumed. Bug: 326367294 Test: atest RecentTasksTest Test: atest MixedDeviceOwnerTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5f1e492e159fd19b567ba5b62d3e2f2e5f733425) Merged-In: Iba8a2004a58a4d440a0c62c59ae89b5e4ca1253c Change-Id: Iba8a2004a58a4d440a0c62c59ae89b5e4ca1253c