OSDN Git Service

Fix crash when removing a display with activities
authorAndrii Kulian <akulian@google.com>
Wed, 28 Dec 2016 07:52:59 +0000 (23:52 -0800)
committerAndrii Kulian <akulian@google.com>
Wed, 28 Dec 2016 07:52:59 +0000 (23:52 -0800)
commit6cc1a1d65cd2b9eaeeb82ac3fe62e8dfc6a9eb01
tree28647af7f7dd77097ab2dd7674389492091c63a9
parentd276563b38907647ce70940e1e90603826df6ab4
Fix crash when removing a display with activities

When secondary display is removed current behavior is to
move its stacks to the primary display. This requires app
windows to be reparented, and there was a check missing
for app windows in DisplayContent.reParentWindowToken.

Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Test: #testMoveStackBetweenDisplays
Bug: 33677605
Change-Id: I2ac2cdba273134438c63385887a09c37d42017bb
services/core/java/com/android/server/wm/DisplayContent.java
services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java