tree 7cede9c473f6e6614c1ab145df38492f70e3cb6a
parent 1aefc4493119ed86abd175fd1b1ce12bca091af3
author Andrew Stadler <stadler@android.com> 1276280501 -0700
committer Andrew Stadler <stadler@android.com> 1276280501 -0700

DO NOT MERGE - Revert workaround for KeyguardLock problem

This reverts commit 3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b.

Because commit 284b62e1b8c3419bfd02c6fea5ba0a68146c06f8 fixes the underlying
conflict between DeviceAdmin policies and apps attempting to disable the
Keyguard Lock, this patch is no longer required.

Accounts with a server policy requiring a device PIN or Password will
now work properly.

Bug: 2737842
Change-Id: I533c27a01a8a331dc11a0cb84bcc78f48edf621c