PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 046a63450f

Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
This commit is contained in:
Steven Ng
2016-11-23 23:28:38 +00:00
committed by android-build-merger
parent 71a0bb85a5 046a63450f
commit 26a3c28735
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -299,7 +299,11 @@ public class ChooseLockGeneric extends SettingsActivity {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT,
mForFingerprint); mForFingerprint);
intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer); intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST); startActivityForResult(
intent,
mIsSetNewPassword && mHasChallenge
? CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
: ENABLE_ENCRYPTION_REQUEST);
} else { } else {
if (mForChangeCredRequiredForBoot) { if (mForChangeCredRequiredForBoot) {
// Welp, couldn't change it. Oh well. // Welp, couldn't change it. Oh well.