commit dd83a65e88d812dd635a9cff0de3a484f56123d4
author Steven Ng <stevenckng@google.com> Tue Oct 25 22:23:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 22:23:35 2016 +0000
tree 0e6a55b8c74a67047c52348562b338698d0741ba
parent 215732141fee6ed33e93683779c6f5277d4c2290
parent bde2c59f006ea112de46197b0b947356defb75bb

Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 am: 046a63450f
am: bde2c59f00

Change-Id: Ie6c4a37d9aaaf9cba94c6fc050600f8acf13f53e

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.