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: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
This commit is contained in:
Ricky Wai
2016-03-18 16:26:35 +00:00
parent 751de37275
commit 36cce830b9
3 changed files with 6 additions and 3 deletions

View File

@@ -566,7 +566,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
return;
}
if (mDpm.getMaximumTimeToLock(null) > 0) {
if (mDpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId()) > 0) {
// A DeviceAdmin has specified a maximum time until the device
// will lock... in this case we can't allow the user to turn
// on "stay awake when plugged in" because that would defeat the