OSDN Git Service

Handle showWhenLocked on secondary displays
authorDavid Stevens <stevensd@google.com>
Thu, 24 Aug 2017 01:41:49 +0000 (18:41 -0700)
committerDavid Stevens <stevensd@google.com>
Tue, 19 Sep 2017 18:15:43 +0000 (18:15 +0000)
commit67c036b1bad9f81dad809f30ed97751b08520cdd
treeaf7a8b62cc5475e028d50b6659ca2b356aa46c14
parent5087723199d200e18a822eb062a1e68cce568b2e
Handle showWhenLocked on secondary displays

The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.

Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug: 64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
core/java/android/app/IActivityManager.aidl
packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/KeyguardController.java
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java