OSDN Git Service

Fix a deadlock due to AMS calling into WMS with its lock held.
authorJeff Brown <jeffbrown@google.com>
Sat, 26 Jul 2014 02:30:05 +0000 (19:30 -0700)
committerJeff Brown <jeffbrown@google.com>
Sat, 26 Jul 2014 02:31:47 +0000 (19:31 -0700)
commit4b4971b8a31f29e9dd3d27d54a49914a7c3ec1fb
tree9ffd8fb6b6052b4877adc518bfa7a31b72482dcd
parent82379ba8ddc04116a40aa177df4ef6c2aa428a69
Fix a deadlock due to AMS calling into WMS with its lock held.

The full deadlock cycle involved ActivityManagerService,
WindowManagerService, and DevicePolicyManagerService.

Fixed by posting the work of enabling the screen to the handler
instead of doing it immediately while holding the activity manager
lock.

Bug: 16578860
Change-Id: I10514cd2df993c7193747ae823e1990a2c34e196
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java