tree 37d742acfea0c4409fe4b63327035a515e0181e1
parent f3bd2f7a3f2eadd5126b1a55ca45bdbffe80ceeb
author Danielle Millett <dmillett@google.com> 1324504952 -0500
committer Danielle Millett <dmillett@google.com> 1324566044 -0500

Fix 5783857: Device Policy Manager doesn't allow Face Unlock

This makes it so that if face unlock is enabled and then a device policy
manager that requires something more secure than face unlock is installed,
the user will be forced to choose a new acceptable lock type.

This was previously fixed for the case where the device had been reset, or
the shell was restarted after setting face unlock, but not for the case where the
device remained on between setting face unlock and setting up a device policy
manager.

Also changed the function ordering of saveLockPattern() so that the overloaded
wrapper function is next to the main function.

Change-Id: Ibed8c4ab137ebbc07fb143faef6f047bc6dc4474