commit 950de0e40aa1c21dc69c64980fa4dab2f1c68eb7
author Andres Morales <anmorales@google.com> Tue Mar 22 21:20:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 22 21:20:43 2016 +0000
tree fbab56aac50f052e39ced4f1c0ea044b8f1eff98
parent 9c867a5703e36f47ec0f6b52fd1dc8b7d3110802
parent 0bb6f70a8789a0b89beaf01ee463f63fc6876ba8

Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e33c081..058ebea 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1836,7 +1836,7 @@
                             (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();