Add a Global setting for disabling OEM unlocking setting

+ Don't enable OEM unlocking setting if the global setting disallows it.

Bug: 28163088
Change-Id: Ic306da3fa2cecb90865be055566a7e1603e6b5e2
This commit is contained in:
Steven Ng
2016-04-27 15:28:40 +01:00
parent 1bc12ee9c2
commit 3fe140315d
2 changed files with 10 additions and 4 deletions

View File

@@ -1014,7 +1014,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
flashLockState = mOemUnlockManager.getFlashLockState();
}
return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED
&& Settings.Global.getInt(getActivity().getContentResolver(),
Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 0;
}
private void updateOemUnlockOptions() {