Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-08-24 00:31:53 +00:00
committed by Android (Google) Code Review

View File

@@ -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);