From 8b85fbfe51753506f6b4eb65892648d49059a8d6 Mon Sep 17 00:00:00 2001 From: Andres Morales Date: Tue, 9 Feb 2016 11:10:10 -0800 Subject: [PATCH] fix issue when cancelling OEM unlocking change Bug: 26928752 Change-Id: Ibafe9df564f1035cbd6782d8982bc3b424ee3cb4 --- src/com/android/settings/DevelopmentSettings.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index af38ad0967..ebba54ccef 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -1702,10 +1702,18 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void confirmEnableOemUnlock() { - DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() { + DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Utils.setOemUnlockEnabled(getActivity(), true); + if (which == DialogInterface.BUTTON_POSITIVE) { + Utils.setOemUnlockEnabled(getActivity(), true); + } + } + }; + + DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { updateAllOptions(); } }; @@ -1713,8 +1721,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment new AlertDialog.Builder(getActivity()) .setTitle(R.string.confirm_enable_oem_unlock_title) .setMessage(R.string.confirm_enable_oem_unlock_text) - .setPositiveButton(R.string.enable_text, onConfirmListener) + .setPositiveButton(R.string.enable_text, onClickListener) .setNegativeButton(android.R.string.cancel, null) + .setOnDismissListener(onDismissListener) .create() .show(); } -- 2.11.0