7501699445f61dc846eb83cbe5bf2272862d2a95 - SHIFTPHONES/android_frameworks_base

commit	7501699445f61dc846eb83cbe5bf2272862d2a95	[log] [tgz]
author	Riddle Hsu <riddlehsu@google.com>	Thu Sep 20 20:37:14 2018 +0800
committer	Riddle Hsu <riddlehsu@google.com>	Thu Oct 04 18:11:12 2018 +0800
tree	80b58c3b901a1b8d5646080c84a76fb5c7a52d5f
parent	bddeea865c7965eabe4310565fc96023cca6da72 [diff]

Fix resuming with focusable always-on-top stacks

When a picture-in-picture menu activity (focusable always-on-top)
is active, the other stacks are always behind it. Then the top
focused is occupied and causes unable to resume the next activity
on another stack properly.

Now not only the z-order of stacks, but also consider the stack
that is preferred to be put at top to decide the focused stack.

Bug: 112084174
Test: atest ActivityDisplayTests
Test: atest ActivityStackSupervisorTests

Change-Id: I93c446f281001afd3c84a3862e31b4682919ab39

services/core/java/com/android/server/am/ActivityDisplay.java[diff]
services/core/java/com/android/server/am/ActivityStack.java[diff]
services/core/java/com/android/server/am/ActivityStackSupervisor.java[diff]
services/tests/servicestests/src/com/android/server/am/ActivityDisplayTests.java[Added - diff]
services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java[diff]

5 files changed

tree: 80b58c3b901a1b8d5646080c84a76fb5c7a52d5f