53a39eacc28b8e022499a208ff74b11e260ea204 - platform/frameworks/base

commit	53a39eacc28b8e022499a208ff74b11e260ea204	[log] [tgz]
author	David Stevens <stevensd@google.com>	Wed Aug 23 18:41:49 2017 -0700
committer	David Stevens <stevensd@google.com>	Tue Sep 12 12:19:50 2017 -0700
tree	3dc226962d6066dcb471b8942d17fff3f3b808ee
parent	9ac371a81e7d144a8e31f77b085867a92bfd2bd5 [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
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: 3dc226962d6066dcb471b8942d17fff3f3b808ee