4163d6288dcf76aa26e288e135a85fba27b8e034 - platform/frameworks/base

commit	4163d6288dcf76aa26e288e135a85fba27b8e034	[log] [tgz]
author	Adrian Roos <roosa@google.com>	Tue May 22 16:56:35 2018 +0200
committer	Adrian Roos <roosa@google.com>	Wed May 23 13:10:27 2018 +0000
tree	fd10ef1228f18f874ea0b063b560d2de52820381
parent	6d0842154bb063632f937ef360557af281b6c2cb [diff]

WM: Prevent secondary display focus while keyguard is up

Fixes an issue where input intended for the keyguard could end up going
to a different display.

To prevent this, make sure that only the default display can get focused
when the keyguard is showing.

Change-Id: I6463c44aedca06930d2c9bda7c45ffd93141308c
Fixes: 71786287
Test: atest DisplayContentTests

services/core/java/com/android/server/policy/PhoneWindowManager.java[diff]
services/core/java/com/android/server/policy/WindowManagerPolicy.java[diff]
services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java[diff]
services/core/java/com/android/server/wm/RootWindowContainer.java[diff]
services/core/java/com/android/server/wm/WindowManagerService.java[diff]
services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java[diff]
services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java[diff]
services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRule.java[diff]

8 files changed

tree: fd10ef1228f18f874ea0b063b560d2de52820381