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

Request enroll or verify lock before FP enroll

Browse Source 
Also pipe through challenge token

Change-Id: I9d6afdbadf3832aeeb18a0b5a9620277e2070872
This commit is contained in:
Andres Morales
2015-04-13 20:49:03 -07:00
parent 6609b0c22a
commit e29dae683e
4 changed files with 99 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/ConfirmLockPattern.java
View File

@@ -233,14 +233,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
@Override
protected void authenticationSucceeded(@Nullable String password) {
Intent intent = new Intent();
if (getActivity() instanceof ConfirmLockPattern.InternalActivity) {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
StorageManager.CRYPT_TYPE_PATTERN);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password);
}
getActivity().setResult(Activity.RESULT_OK, intent);
getActivity().finish();
// TODO: make this play nice with challenge
}
@Override
@@ -299,7 +292,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
}
if (matched) {
authenticationSucceeded(LockPatternUtils.patternToString(pattern));
getActivity().setResult(Activity.RESULT_OK, intent);
getActivity().finish();
} else {