1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockPatternSize.java b/src/com/android/settings/ChooseLockPatternSize.java
index 59b0644..b6f17f1 100644
--- a/src/com/android/settings/ChooseLockPatternSize.java
+++ b/src/com/android/settings/ChooseLockPatternSize.java
@@ -92,8 +92,13 @@ public class ChooseLockPatternSize extends PreferenceActivity {
                         originatingIntent.getLongExtra(
                                 ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
             }
+            // Forward the Encryption interstitial required password selection
+            if (originatingIntent.hasExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD)) {
+                intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, originatingIntent
+                        .getBooleanExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true));
+            }
             intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                    startActivity(intent);
+            startActivity(intent);
 
             finish();
             return true;