Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev

am: 2006403

* commit '20064037a7e52584a69edbaeccd29c23630a4156':
  handle devices that don't support FLASH_LOCK_STATE

Change-Id: Ib5857f6a49aa8f2e105900a6ec0bcb2bf4908067
This commit is contained in:
Andres Morales
2016-04-07 00:09:13 +00:00
committed by android-build-merger

View File

@@ -1007,7 +1007,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
flashLockState = mOemUnlockManager.getFlashLockState(); flashLockState = mOemUnlockManager.getFlashLockState();
} }
return flashLockState == PersistentDataBlockManager.FLASH_LOCK_LOCKED; return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
} }
private void updateOemUnlockOptions() { private void updateOemUnlockOptions() {