OSDN Git Service

Use a consistent policy for filtering wake keys.
authorJeff Brown <jeffbrown@google.com>
Wed, 7 Nov 2012 00:32:01 +0000 (16:32 -0800)
committerJeff Brown <jeffbrown@google.com>
Wed, 7 Nov 2012 00:48:15 +0000 (16:48 -0800)
commit1c2e4948a1f0e803171389427212321973ea66b8
tree6372f2e60b27460be4a64ee9939d0bbd3a7b0086
parent0f4d5df5d815466398dba5f2d07aa98f18c35aaa
Use a consistent policy for filtering wake keys.

Previously wake keys were filtered differently depending on whether
a keyguard was showing.  If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.

This change ensures that we use the same policy consistently
regardless of whether keyguard is showing.  The behavior is
otherwise the same.

Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.

Bug: 7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java