From 83f91f61aedbdfbd63131154e01173adedc1968e Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 23 Aug 2016 15:13:22 -0700
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4e5da6ebec1..08eae1a5941 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1035,7 +1035,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     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);