Refactor BiometricEnrollBase::onStop()
During BiometricEnrollBase::onStop(), it judeges activity result and determine finishing self or not by a common rule. And it causes some problems. 1. It may override original setResult() which was set by its child activity. 2. If we change the judgmental rule in BiometricEnollBase, we need to manully test all override class cases to make sure everything works well. It makes us hard to change the criteria here. Move code in BiometricEnrollBase::onStop() to its extended class to have more flexiable. Bug: 197717071 Test: Run ROBOTEST for SetupFingerprintEnrollIntroductionTest SetupFingerprintEnrollFinishTest FingerprintEnrollEnrollingTest FingerprintEnrollFindSensorTest FingerprintEnrollIntroductionTest SetupFingerprintEnrollFindSensorTest Test: Manully test fingerprint/faceauth flow in settings or SUW Change-Id: I5d6c63cf537c0146bc03bd2b36ee3e1d68918a19
This commit is contained in:
@@ -241,6 +241,16 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
|
||||
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
|
||||
setResult(RESULT_TIMEOUT);
|
||||
finish();
|
||||
}
|
||||
super.onStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
|
Reference in New Issue
Block a user