commit cd9d948d7e56071fd85a96de151b13268dc22b94
author Marie Janssen <jamuraa@google.com> Fri Oct 28 02:57:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 28 02:57:06 2016 +0000
tree 0e6a55b8c74a67047c52348562b338698d0741ba
parent 10d6c409d4de30c5f2370381eeb0685f48232e60
parent 6e8a67c008c713cab69bd0faf0d11bc25f99f527

Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours am: ce2a10b743
am: 6e8a67c008

Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 3b592d4..d109eb1 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -299,7 +299,11 @@
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT,
                         mForFingerprint);
                 intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
-                startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST);
+                startActivityForResult(
+                        intent,
+                        mIsSetNewPassword && mHasChallenge
+                                ? CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
+                                : ENABLE_ENCRYPTION_REQUEST);
             } else {
                 if (mForChangeCredRequiredForBoot) {
                     // Welp, couldn't change it. Oh well.