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

Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev am: 950de0e

Browse Source 
am: 130721a

* commit '130721a419d4c99ee06c7d44e450ff8167834736':
  don't toggle OEM unlocking if the preference is not enabled
This commit is contained in:
Andres Morales
2016-03-22 21:42:40 +00:00
committed by android-build-merger
parent 64d39af2ca 130721a419
commit 5ca4f4ef79
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

@@ -1836,7 +1836,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
(BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
} else if (preference == mBtHciSnoopLog) {
writeBtHciSnoopLogOptions();
} else if (preference == mEnableOemUnlock) {
} else if (preference == mEnableOemUnlock && mEnableOemUnlock.isEnabled()) {
if (mEnableOemUnlock.isChecked()) {
if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
confirmEnableOemUnlock();