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

Commit 7df06f13 authored by Udam Saini's avatar Udam Saini
Browse files

Only display warning to user if we are enabling OEM 

When we disable OEM unlocking through developer options, no need
to show the warning dialog.

bug:26285618
Change-Id: I476761aeb850a60f345fc2fd8cbdb4ec730cc2c9
parent 4ccc2c35

src/com/android/settings/DevelopmentSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -1762,13 +1762,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        } else if (preference == mBtHciSnoopLog) {

            writeBtHciSnoopLogOptions();

        } else if (preference == mEnableOemUnlock) {

            if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {

            if (mEnableOemUnlock.isChecked()) {

                if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {

                    confirmEnableOemUnlock();

                }

            } else {

                Utils.setOemUnlockEnabled(getActivity(), false);

            }

            }

        } else if (preference == mMockLocationAppPref) {

            Intent intent = new Intent(getActivity(), AppPicker.class);

            intent.putExtra(AppPicker.EXTRA_REQUESTIING_PERMISSION,