66692500344cab2f53cdb6ee1545c567fff7cb16 - platform_frameworks_base

commit	66692500344cab2f53cdb6ee1545c567fff7cb16	[log] [tgz]
author	Jeff Brown <jeffbrown@google.com>	Thu Oct 18 16:13:44 2012 -0700
committer	Jeff Brown <jeffbrown@google.com>	Thu Oct 18 17:37:39 2012 -0700
tree	c58290fc3cee7aebced1d2d1756f792dde0b0a6e
parent	88c66cbb00a572ac8280f0e0ea38079d48ec59f3 [diff]

Fix deadlock.

The display manager must never call into the activity manager with
its lock held.  Make it clear that the adapters are constructed
while holding the syncroot lock.

Bug: 7377631
Change-Id: I1557313cbb31dcad9b5a46919a88a5a1c1af3e9b

services/java/com/android/server/display/DisplayAdapter.java[diff]
services/java/com/android/server/display/HeadlessDisplayAdapter.java[diff]
services/java/com/android/server/display/LocalDisplayAdapter.java[diff]
services/java/com/android/server/display/OverlayDisplayAdapter.java[diff]
services/java/com/android/server/display/WifiDisplayAdapter.java[diff]

5 files changed

tree: c58290fc3cee7aebced1d2d1756f792dde0b0a6e