67c036b1bad9f81dad809f30ed97751b08520cdd - platform/frameworks/base

commit	67c036b1bad9f81dad809f30ed97751b08520cdd	[log] [tgz]
author	David Stevens <stevensd@google.com>	Wed Aug 23 18:41:49 2017 -0700
committer	David Stevens <stevensd@google.com>	Tue Sep 19 18:15:43 2017 +0000
tree	af7a8b62cc5475e028d50b6659ca2b356aa46c14
parent	5087723199d200e18a822eb062a1e68cce568b2e [diff]

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[diff]
packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java[diff]
packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java[diff]
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java[diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/am/ActivityStack.java[diff]
services/core/java/com/android/server/am/KeyguardController.java[diff]
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java[diff]

8 files changed

tree: af7a8b62cc5475e028d50b6659ca2b356aa46c14