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

am: dd83a65e88 Change-Id: I0e0536c168d7438057701783cb54a42ad4b9010e
2016-10-25 22:31:38 +00:00
parent 42a0870b8c dd83a65e88
commit 37fe25489f
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -298,7 +298,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.