Pass Timeout back to upper biometric preference
When FaceSettings or FingerprintSettings are closed because of onStop(), this information can't been passed back to previous Preference screen, CombinedBiometricSettings, because handlePreferenceTreeClick() from AbstractPreferenceController class only can launchActivity() throguh preference's Context. In order to recevice the activity result code from FaceSettings or FingerprintSettings, add handleBiometricPreferenceTreeClick() method in BiometricStatusPreferenceController. Then CombinedBiometricSettings uses this method to show FaceSettings or FingerprintSettings through launchActivityForResult(). Bug: 263057093 Test: atest BiometricNavigationUtilsTest Test: Manually open camera through double-click power key on different pages inside "Face & Fingerprint Unlock" Change-Id: I99167739766ad5ea5f204b0f0543ba6ad18fac31
This commit is contained in:
@@ -669,6 +669,7 @@ public class FingerprintSettings extends SubSettings {
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
if (!getActivity().isChangingConfigurations() && !mLaunchedConfirm && !mIsEnrolling) {
|
||||
setResult(RESULT_TIMEOUT);
|
||||
getActivity().finish();
|
||||
}
|
||||
}
|
||||
@@ -874,6 +875,12 @@ public class FingerprintSettings extends SubSettings {
|
||||
} else if (requestCode == AUTO_ADD_FIRST_FINGERPRINT_REQUEST) {
|
||||
if (resultCode != RESULT_FINISHED || data == null) {
|
||||
Log.d(TAG, "Add first fingerprint, fail or null data, result:" + resultCode);
|
||||
if (resultCode == BiometricEnrollBase.RESULT_TIMEOUT) {
|
||||
// If "Fingerprint Unlock" is closed because of timeout, notify result code
|
||||
// back because "Face & Fingerprint Unlock" has to close itself for timeout
|
||||
// case.
|
||||
setResult(resultCode);
|
||||
}
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user