PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix issue when cancelling OEM unlocking change" into nyc-dev

Browse Source
This commit is contained in:
Andres Morales
2016-02-24 16:05:21 +00:00
committed by Android (Google) Code Review
parent 9b67583c64 8b85fbfe51
commit cc81fb8875
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1698,10 +1698,18 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} }
private void confirmEnableOemUnlock() { private void confirmEnableOemUnlock() {
DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() { DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { 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(); updateAllOptions();
} }
}; };
@@ -1709,8 +1717,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(getActivity())
.setTitle(R.string.confirm_enable_oem_unlock_title) .setTitle(R.string.confirm_enable_oem_unlock_title)
.setMessage(R.string.confirm_enable_oem_unlock_text) .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) .setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(onDismissListener)
.create() .create()
.show(); .show();
} }