summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockPassword.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-04-13 17:43:36 -0700
committerJim Miller <jaggies@google.com>2010-04-14 01:15:05 -0700
commit2deec7edc937b1d19df0a74c4cd0c5ee3ef33070 (patch)
tree29bae509042b617da667c1dc1c49590feccb29d2 /src/com/android/settings/ChooseLockPassword.java
parentfc5a02225e8bca21f07543f55e1b51a33670c501 (diff)
downloadpackages_apps_settings-2deec7edc937b1d19df0a74c4cd0c5ee3ef33070.zip
packages_apps_settings-2deec7edc937b1d19df0a74c4cd0c5ee3ef33070.tar.gz
packages_apps_settings-2deec7edc937b1d19df0a74c4cd0c5ee3ef33070.tar.bz2
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/ChooseLockPassword.java')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 63c7896..b5e72d7 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -119,7 +119,8 @@ public class ChooseLockPassword extends Activity implements OnClickListener, OnE
if (savedInstanceState == null) {
updateStage(Stage.Introduction);
if (confirmCredentials) {
- mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST);
+ mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
+ null, null);
}
}
}