diff options
| author | Roman Birg <roman@cyngn.com> | 2016-03-21 15:17:16 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-03-21 16:02:23 -0700 |
| commit | 0d512152acf347256bcce0e0bba882ee61e2d366 (patch) | |
| tree | 3ce9d495188cda13ac8674ef82a7638df4dd6e7b | |
| parent | 1cfc5375a9c1e27b188c3659610dbec655067cf6 (diff) | |
| download | packages_apps_Settings-0d512152acf347256bcce0e0bba882ee61e2d366.zip packages_apps_Settings-0d512152acf347256bcce0e0bba882ee61e2d366.tar.gz packages_apps_Settings-0d512152acf347256bcce0e0bba882ee61e2d366.tar.bz2 | |
Settings: forward decrypt required on boot flag
This wasn't being pass forward and all of the defaults had it set to
true.
Ticket: CYNGNOS-2270
Change-Id: I90a6c918bb5b4b52791bcff18a6ea3bcfb194547
Signed-off-by: Roman Birg <roman@cyngn.com>
| -rw-r--r-- | src/com/android/settings/ChooseLockPatternSize.java | 7 |
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; |