cfca258639f81b33dd60aa9c05dbc4f4190ac11e - platform/frameworks/base

commit	cfca258639f81b33dd60aa9c05dbc4f4190ac11e	[log] [tgz]
author	Wale Ogunwale <ogunwale@google.com>	Wed Oct 19 09:53:25 2016 -0700
committer	Wale Ogunwale <ogunwale@google.com>	Wed Oct 19 09:53:25 2016 -0700
tree	0fec1877adf2a2988d61d9376a55ba1b292f5232
parent	c69694abbdbfa3f0bedb034e7cc86823a72ff781 [diff]

Fixed monkey test failure

Avoid duplicate attempt to remove WindowToken from its parent
container when removeImmediately is called by first removing the
token from the display before calling super.removeImmediately
which only tries to remove the child from the parent container
if it is still attached to the parent.

Also, added test for the failure case the monkey test was
triggering.

Bug: 32239922
Test: WindowTokenTests.testChildRemoval passes
Change-Id: I4153669d18260d956c4b570944d2f48516d692ac

services/core/java/com/android/server/wm/Session.java[diff]
services/core/java/com/android/server/wm/WindowManagerService.java[diff]
services/core/java/com/android/server/wm/WindowToken.java[diff]
services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java[diff]
services/tests/servicestests/src/com/android/server/wm/WindowTokenTests.java[diff]

5 files changed

tree: 0fec1877adf2a2988d61d9376a55ba1b292f5232