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

Revert "Refactor BiometricEnrollBase::onStop()"

Browse Source 
This reverts commit 6b6d8c0d6d.

Reason for revert: Should use shouldFinishWhenBackgrounded() to
control the behavior during onStop()

Bug: 197717071
Change-Id: I6aeacd5fb0d4400911a2e3d1567db660a0f1798a
This commit is contained in:
Milton Wu
2022-08-04 09:27:41 +00:00
parent ab8624c6ef
commit da7f6fca7a
8 changed files with 12 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -181,6 +181,16 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
getWindow().setStatusBarColor(getBackgroundColor());
}
@Override
protected void onStop() {
super.onStop();
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
}
protected boolean shouldFinishWhenBackgrounded() {
return !WizardManagerHelper.isAnySetupWizard(getIntent());
}

10
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -241,16 +241,6 @@ 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);

10
src/com/android/settings/biometrics/BiometricHandoffActivity.java
View File

@@ -49,16 +49,6 @@ public class BiometricHandoffActivity extends BiometricEnrollBase {
mFooterBarMixin.setPrimaryButton(getPrimaryFooterButton());
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@NonNull
protected FooterButton getPrimaryFooterButton() {
if (mPrimaryFooterButton == null) {

7
src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
View File

@@ -62,11 +62,7 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
if (mSidecar != null) {
mSidecar.setListener(null);
@@ -84,7 +80,6 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
}
finish();
}
super.onStop();
}
@Override

10
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -170,16 +170,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
}
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
protected boolean shouldFinishWhenBackgrounded() {
return super.shouldFinishWhenBackgrounded() && !mNextClicked;

11
src/com/android/settings/biometrics/face/FaceEnrollFinish.java
View File

@@ -22,7 +22,6 @@ import android.view.View;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
@@ -49,16 +48,6 @@ public class FaceEnrollFinish extends BiometricEnrollBase {
);
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
public int getMetricsCategory() {
return SettingsEnums.FACE_ENROLL_FINISHED;

7
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -249,15 +249,10 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
@Override
protected void onStop() {
super.onStop();
if (mAnimation != null) {
mAnimation.pauseAnimation();
}
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override

10
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
View File

@@ -108,16 +108,6 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
}
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
protected void onNextButtonClick(View view) {
updateFingerprintSuggestionEnableState();