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)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 10 Aug 2018 20:27:49 +0000 (20:27 +0000)
commit03af9f281932c163617f5dd01f1371e026d9de49
treed4e69e0a11fa0f73dbf2c4fa66f2f9174c5f2005
parenteef265cf5e5097e66adaf502260404fce32fca37
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
(cherry picked from commit 3cd5e3d9bbb3255e874b8fa27d7ed506164905dd)
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