f1b674197577e815040cd75ef86d611965d603ad - platform/frameworks/base

commit	f1b674197577e815040cd75ef86d611965d603ad	[log] [tgz]
author	Craig Mautner <cmautner@google.com>	Wed Sep 19 13:18:29 2012 -0700
committer	Craig Mautner <cmautner@google.com>	Wed Sep 19 13:18:29 2012 -0700
tree	4a960bb3452b2dd4fb192c774cc4866f8d194993
parent	5d1a870a25f7495755432a42cf8c81818dc369fa [diff]

Fix deadlock in LockPatternUtils by using local id.

Activity manager now updates window manager's current user id
directly and immediately rather than waiting for a broadcast
update. Window manager passes this through policy to the
KeyguardViewMediator and into LockPatternUtils. LockPatternUtils
no longer goes to Activity to get the current user id if it finds
that its local id is non-default.

Fixes bug 7193726.

Change-Id: Id5613e7a9fe9e5b49e83c26b74504f587c3998c2

core/java/android/view/WindowManagerPolicy.java[diff]
core/java/com/android/internal/widget/LockPatternUtils.java[diff]
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java[diff]
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java[diff]
services/java/com/android/server/am/ActivityManagerService.java[diff]
services/java/com/android/server/wm/WindowManagerService.java[diff]
services/java/com/android/server/wm/WindowState.java[diff]

7 files changed

tree: 4a960bb3452b2dd4fb192c774cc4866f8d194993