PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am: de090f3f85 am: 3300192cdb

Browse Source 
am: 6c5c9ba8cb

Change-Id: Ib4a9e14a63bc6f2cb4cd49b1c20e3efacc95f204
This commit is contained in:
Svetoslav Ganov
2016-08-24 16:17:57 +00:00
committed by android-build-merger
parent eccd37267c 6c5c9ba8cb
commit c459be6e29
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1035,7 +1035,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private void updateOemUnlockOptions() { private void updateOemUnlockOptions() {
if (mEnableOemUnlock != null) { if (mEnableOemUnlock != null) {
updateSwitchPreference(mEnableOemUnlock, isBootloaderUnlocked()); updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity()));
updateOemUnlockSettingDescription(); updateOemUnlockSettingDescription();
// Showing mEnableOemUnlock preference as device has persistent data block. // Showing mEnableOemUnlock preference as device has persistent data block.
mEnableOemUnlock.setDisabledByAdmin(null); mEnableOemUnlock.setDisabledByAdmin(null);