OSDN Git Service

Fix bugs around unification when no password is set
authorClara Bayarri <clarabayarri@google.com>
Wed, 20 Jan 2016 15:39:59 +0000 (15:39 +0000)
committerClara Bayarri <clarabayarri@google.com>
Thu, 21 Jan 2016 15:27:38 +0000 (15:27 +0000)
commit7402b2514358e02a0e0adde982b6deb8552dc28a
tree736dce52a7d5a5d7a72c93d8ef2b0a6b97e4bf9b
parentad1a279ac1e101908e226f78d71af2eead74265a
Fix bugs around unification when no password is set

- When in a unified state, selecting the work lock to be "none" caused
a security exception
- When the work lock was set to "none", unifying didn't work
- When in a unified state, the work lock type selection screen showed
"none" as the current type instead of the device lock type

Bug: 26577247
Change-Id: I853d77186e23b6a458eaa6c1047942a7eefddc9c
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/ProfileChallengePreferenceFragment.java