diff options
| author | Jim Miller <jaggies@google.com> | 2010-04-13 17:43:36 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-04-14 01:15:05 -0700 |
| commit | 2deec7edc937b1d19df0a74c4cd0c5ee3ef33070 (patch) | |
| tree | 29bae509042b617da667c1dc1c49590feccb29d2 /src/com/android/settings/ChooseLockGeneric.java | |
| parent | fc5a02225e8bca21f07543f55e1b51a33670c501 (diff) | |
| download | packages_apps_Settings-2deec7edc937b1d19df0a74c4cd0c5ee3ef33070.tar.gz packages_apps_Settings-2deec7edc937b1d19df0a74c4cd0c5ee3ef33070.tar.bz2 packages_apps_Settings-2deec7edc937b1d19df0a74c4cd0c5ee3ef33070.zip | |
Fix 2594148: confirm PIN/Password before resetting device
This fixes a bug where user was allowed to factory reset the device
without entering their PIN/Password.
It also fixes the same issue with MediaFormat (Settings->SD Card->Format).
Change-Id: I0677a50aa771ad8663513fd7ec398a70953dcde2
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 757807807..0672ad922 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -54,7 +54,7 @@ public class ChooseLockGeneric extends PreferenceActivity { if (!mPasswordConfirmed) { ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this); - if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST)) { + if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST, null, null)) { mPasswordConfirmed = true; // no password set, so no need to confirm updatePreferencesOrFinish(); } |