e4044bb617ea849939058d953e250fcd540c75cc - platform/frameworks/base

commit	e4044bb617ea849939058d953e250fcd540c75cc	[log] [tgz]
author	Jim Miller <jaggies@google.com>	Tue May 10 18:38:25 2016 -0700
committer	Jim Miller <jaggies@google.com>	Tue May 10 18:38:25 2016 -0700
tree	1e30674b84ff669ab152cdef2c04a495764d221a
parent	1fdeb5bdf7530eef212b414860569202eb5a68fa [diff]

Fix KeyguardManager.isSecure() to observe work profile

The fix passes the calling userId instead of the current userId to
allow apps running as managed profiles to work.

Fixes bug 28666104

Change-Id: I9f8676ab11bd581d9e67b2b9f385036d4d3576ee

core/java/android/view/WindowManagerPolicy.java[diff]
services/core/java/com/android/server/policy/PhoneWindowManager.java[diff]
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java[diff]
services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java[diff]
services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java[diff]
services/core/java/com/android/server/wm/WindowManagerService.java[diff]

6 files changed

tree: 1e30674b84ff669ab152cdef2c04a495764d221a