035e92447084b96ef2c9125e77105c237e20bad3 - platform/frameworks/base

commit	035e92447084b96ef2c9125e77105c237e20bad3	[log] [tgz]
author	Ricky Wai <rickywai@google.com>	Fri Mar 18 16:43:31 2016 +0000
committer	Ricky Wai <rickywai@google.com>	Thu Apr 07 17:16:03 2016 +0100
tree	bf53a07c8b26b842883c5d429bc4ccd11c250f86
parent	6e0b305fc03f7bdc8400ebd283b55a057518f040 [diff]

Fix work profile screen timeout policy

Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2

core/java/android/app/admin/DevicePolicyManager.java[diff]
core/java/android/app/admin/IDevicePolicyManager.aidl[diff]
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java[diff]
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java[diff]
services/core/java/com/android/server/trust/TrustAgentWrapper.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]

6 files changed

tree: bf53a07c8b26b842883c5d429bc4ccd11c250f86