3cd5e3d9bbb3255e874b8fa27d7ed506164905dd - platform_frameworks_base

commit	3cd5e3d9bbb3255e874b8fa27d7ed506164905dd	[log] [tgz]
author	Adrian Roos <roosa@google.com>	Tue May 22 16:56:35 2018 +0200
committer	Adrian Roos <roosa@google.com>	Thu May 24 14:05:44 2018 +0200
tree	f878a579ad573cbbdcdaaa54b9ba2a1983221f23
parent	99e6aa1b1e77187084f9d19670eba1e513d69b62 [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
Merged-In: I6463c44aedca06930d2c9bda7c45ffd93141308c
Fixes: 71786287
Test: atest DisplayContentTests

core/java/android/view/WindowManagerPolicy.java[diff]
services/core/java/com/android/server/policy/PhoneWindowManager.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]

7 files changed

tree: f878a579ad573cbbdcdaaa54b9ba2a1983221f23