commit ce4bdca151dff1912fdbb6b6ca18cfed8c38a98b
author Andres Morales <anmorales@google.com> Wed Apr 06 13:22:08 2016 -0700
committer Andres Morales <anmorales@google.com> Wed Apr 06 15:04:48 2016 -0700
tree 6e3276fbe647ce0a52af7f5595ab0dff9ea2fd36
parent 9c867a5703e36f47ec0f6b52fd1dc8b7d3110802

handle devices that don't support FLASH_LOCK_STATE

only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.

Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e33c081..c3bbcdc 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1009,7 +1009,7 @@
             flashLockState = mOemUnlockManager.getFlashLockState();
         }
 
-        return flashLockState == PersistentDataBlockManager.FLASH_LOCK_LOCKED;
+        return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
     }
 
     private void updateOemUnlockOptions() {