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

am: bde2c59f00 Change-Id: Ie6c4a37d9aaaf9cba94c6fc050600f8acf13f53e
2016-10-25 22:23:35 +00:00
parent 215732141f bde2c59f00
commit dd83a65e88
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -299,7 +299,11 @@ public class ChooseLockGeneric extends SettingsActivity {
                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.