OSDN Git Service

WM: Prevent secondary display focus while keyguard is up
authorAdrian Roos <roosa@google.com>
Tue, 22 May 2018 14:56:35 +0000 (16:56 +0200)
committerAdrian Roos <roosa@google.com>
Thu, 24 May 2018 12:05:44 +0000 (14:05 +0200)
commit3cd5e3d9bbb3255e874b8fa27d7ed506164905dd
treef878a579ad573cbbdcdaaa54b9ba2a1983221f23
parent99e6aa1b1e77187084f9d19670eba1e513d69b62
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
services/core/java/com/android/server/policy/PhoneWindowManager.java
services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
services/core/java/com/android/server/wm/RootWindowContainer.java
services/core/java/com/android/server/wm/WindowManagerService.java
services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java