AF/FR Fix onActivityResult condition.
Chase list bug. Accidentally bailed on true effectively.
Manual tested by going to Settings > System > Erase All Data
And then hitting then successfully wiping and reseting.
Test: make RunSettingsRoboTests -j40
Bug: 72324059
Change-Id: Ib2a155820811f0ec62a45c1312475c24646ede76
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 0e337f6..b7fb694 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -75,7 +75,7 @@
public class MasterClear extends InstrumentedPreferenceFragment {
private static final String TAG = "MasterClear";
- private static final int KEYGUARD_REQUEST = 55;
+ @VisibleForTesting static final int KEYGUARD_REQUEST = 55;
@VisibleForTesting static final int CREDENTIAL_CONFIRM_REQUEST = 56;
private static final String KEY_SHOW_ESIM_RESET_CHECKBOX
@@ -118,11 +118,16 @@
request, res.getText(R.string.master_clear_title));
}
+ @VisibleForTesting
+ boolean isValidRequestCode(int requestCode) {
+ return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST));
+ }
+
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode != KEYGUARD_REQUEST || requestCode != CREDENTIAL_CONFIRM_REQUEST) {
+ if (!isValidRequestCode(requestCode)) {
return;
}