summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DevelopmentSettings.java
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2016-05-24 08:46:20 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-24 14:17:47 -0700
commit317b86efdaa3d87b985c97e8859c21ca473a1f85 (patch)
tree6d3580b1b179e6d89f720de35478bc76998bd767 /src/com/android/settings/DevelopmentSettings.java
parent477dca6c3bc6064aac635a661ef7ab6c83bc7c3c (diff)
downloadpackages_apps_Settings-317b86efdaa3d87b985c97e8859c21ca473a1f85.zip
packages_apps_Settings-317b86efdaa3d87b985c97e8859c21ca473a1f85.tar.gz
packages_apps_Settings-317b86efdaa3d87b985c97e8859c21ca473a1f85.tar.bz2
Settings: Update oem unlocking status when dismiss
When oem unlocking confirm dialog dismiss, need to update the checkbox status also. FEIJ-780 Change-Id: I9b5c4446ecd9736051fb7b6c12ad22aa0d985a85
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
-rw-r--r--src/com/android/settings/DevelopmentSettings.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 3054cec..630844a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1761,7 +1761,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Utils.setOemUnlockEnabled(getActivity(), true);
+ if (which == DialogInterface.BUTTON_POSITIVE) {
+ Utils.setOemUnlockEnabled(getActivity(), true);
+ }
updateAllOptions();
}
};
@@ -1770,7 +1772,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
.setTitle(R.string.confirm_enable_oem_unlock_title)
.setMessage(R.string.confirm_enable_oem_unlock_text)
.setPositiveButton(R.string.enable_text, onConfirmListener)
- .setNegativeButton(android.R.string.cancel, null)
+ .setNegativeButton(android.R.string.cancel, onConfirmListener)
.create()
.show();
}