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

Allows user to skip fingerprint during setup

Browse Source 
bug:26906231
Change-Id: Ibc73f2dad01b82f93d92a9351693a221cbe8cf6e
This commit is contained in:
Udam Saini
2016-02-01 15:27:13 -08:00
parent 9061164b23
commit 861210c290
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -103,19 +103,24 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == RESULT_FINISHED) {
if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) {
setResult(RESULT_OK);
final boolean isResultFinished = resultCode == RESULT_FINISHED;
if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) {
if (isResultFinished || resultCode == RESULT_SKIP) {
final int result = isResultFinished ? RESULT_OK : RESULT_SKIP;
setResult(result);
finish();
} else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
return;
}
} else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
if (isResultFinished) {
updatePasswordQuality();
byte[] token = data.getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
launchFindSensor(token);
return;
}
} else {
super.onActivityResult(requestCode, resultCode, data);
}
super.onActivityResult(requestCode, resultCode, data);
}
@Override