Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde2c59f authored by Steven Ng's avatar Steven Ng Committed by android-build-merger
Browse files

Nexus imprint setting is missing while adding corp account from SUW am: 378dec14 

am: 046a6345

Change-Id: I3a393fb00ab8f312ca078b08feb42decb106fb81
parents 79d7ca60 046a6345

src/com/android/settings/ChooseLockGeneric.java

+5 −1
Original line number Diff line number Diff line
@@ -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.