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

Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev am: b4bbc52e27

Browse Source 
am: 57d52c6b50

Change-Id: Iec562ad11b1ca6488dff21bac38c4983b2db1ca4
This commit is contained in:
Kevin Chyn
2017-06-20 23:47:27 +00:00
committed by android-build-merger
parent f18fa145f2 57d52c6b50
commit 2aecf00ef1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -261,14 +261,18 @@ public class FingerprintSettings extends SubSettings {
mHandler.postDelayed(mFingerprintLockoutReset,
LOCKOUT_DURATION);
}
// Fall through to show message
default:
// Activity can be null on a screen rotation.
final Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity, msg , Toast.LENGTH_SHORT);
}
break;
break;
case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT:
mInFingerprintLockout = true;
break;
}
if (mInFingerprintLockout) {
// Activity can be null on a screen rotation.
final Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity, msg , Toast.LENGTH_SHORT).show();
}
}
retryFingerprint(); // start again
}