diff options
| author | Keith Mok <kmok@cyngn.com> | 2016-05-24 15:25:09 -0700 |
|---|---|---|
| committer | Keith Mok <kmok@cyngn.com> | 2016-05-24 15:27:03 -0700 |
| commit | d48e7e93555b88749d6204ba6fd430aafc8cce30 (patch) | |
| tree | 6e355d535a7b876d2eefda995e8f2ae646363123 /src/com/android | |
| parent | 317b86efdaa3d87b985c97e8859c21ca473a1f85 (diff) | |
| download | packages_apps_Settings-d48e7e93555b88749d6204ba6fd430aafc8cce30.zip packages_apps_Settings-d48e7e93555b88749d6204ba6fd430aafc8cce30.tar.gz packages_apps_Settings-d48e7e93555b88749d6204ba6fd430aafc8cce30.tar.bz2 | |
Settings: Update oem unlocking status with back button
When oem unlocking confirm dialog dismiss by back button,
the enable oem lock status is not consistent.
FEIJ-780
Change-Id: I42a33896c8d844d965cfc706872903175ffbf1cc
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 630844a..04e28e7 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -1758,7 +1758,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void confirmEnableOemUnlock() { - DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() { + DialogInterface.OnClickListener onEnableOemListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_POSITIVE) { @@ -1771,8 +1771,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) - .setNegativeButton(android.R.string.cancel, onConfirmListener) + .setPositiveButton(R.string.enable_text, onEnableOemListener) + .setNegativeButton(android.R.string.cancel, onEnableOemListener) + .setCancelable(false) .create() .show(); } |