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

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();
             }