tree 600e22507e05e4250e071c4e287d9f7544fe598c
parent 87959cdd8560e743956a71bb687799e94053e086
author Dianne Hackborn <hackbod@google.com> 1339805125 -0700
committer Dianne Hackborn <hackbod@google.com> 1339806196 -0700

Fix issue #6664140: Time to lock should work even Stay awake...

...in Developer options is on

Don't respect stay awake while on as long as a time to lock limit
is being enforced.  When we start enforcing one, make sure the
setting is off (since we won't be respecting it anyway).

Bug: 6664140
Change-Id: Id07cb528afa0c64c7766341841c51771f507121d