Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 950de0e4 authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

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

parents 9c867a57 0bb6f70a

src/com/android/settings/DevelopmentSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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();