commit 83f91f61aedbdfbd63131154e01173adedc1968e
author Fan Zhang <zhfan@google.com> Tue Aug 23 15:13:22 2016 -0700
committer Fan Zhang <zhfan@google.com> Tue Aug 23 15:14:19 2016 -0700
tree a1df507a4d7003f8b90acb5b72815c35e729f2c4
parent 124251d54e7c0e3610e87aa72bd84b21750057ed

Use isOemUnlockEnabled to drive oem unlocking toggle.

Bug: 31031467
Test: manually turned on/off persistent_data_block

Change-Id: I21d18a898a220f9e46a53715d4b4fa01c7116e7f

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4e5da6e..08eae1a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1035,7 +1035,7 @@
 
     private void updateOemUnlockOptions() {
         if (mEnableOemUnlock != null) {
-            updateSwitchPreference(mEnableOemUnlock, isBootloaderUnlocked());
+            updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity()));
             updateOemUnlockSettingDescription();
             // Showing mEnableOemUnlock preference as device has persistent data block.
             mEnableOemUnlock.setDisabledByAdmin(null);