commit 09797c330c0f5f0f88b16cc01f95ae9c7e8e1d8b
author Paul Stewart <pstew@google.com> Fri Oct 28 21:14:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 28 21:14:38 2016 +0000
tree 444b03d3938e5f201c0e11f32114413d8307c689
parent cd9d948d7e56071fd85a96de151b13268dc22b94
parent dab924f04da95f5bbea39ee6ba35e48629897055

Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968
am: dab924f04d

Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0

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.