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

am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev

Browse Source 
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
This commit is contained in:
Maurice Lam
2015-07-23 20:09:27 +00:00
committed by Android Git Automerger
parent 3f7ff2b60f 06dc59305f
commit 3b798650fc
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -214,9 +214,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
private void launchFinish(byte[] token) { private void launchFinish(byte[] token) {
Intent intent = getFinishIntent(); Intent intent = getFinishIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
startActivity(intent); startActivity(intent);
setResult(RESULT_FINISHED);
finish(); finish();
} }

9
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.fingerprint; package com.android.settings.fingerprint;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle; import android.os.Bundle;
@@ -75,6 +76,14 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
if (resultCode == RESULT_FINISHED) { if (resultCode == RESULT_FINISHED) {
setResult(RESULT_FINISHED); setResult(RESULT_FINISHED);
finish(); finish();
} else {
FingerprintManager fpm = getSystemService(FingerprintManager.class);
int enrolled = fpm.getEnrolledFingerprints().size();
int max = getResources().getInteger(
com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
if (enrolled >= max) {
finish();
}
} }
} else { } else {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);

1
src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
View File

@@ -55,6 +55,7 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase {
@Override @Override
protected void onNextButtonClick() { protected void onNextButtonClick() {
setResult(RESULT_FINISHED);
finish(); finish();
} }