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

AF/FR Fix onActivityResult condition.

Browse Source 
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
(cherry picked from commit 5dd6ed470e)
This commit is contained in:
Carlos Valdivia
2018-01-23 09:12:59 -08:00
committed by android-merger
parent f3170b317f
commit e2ad4149ab
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/MasterClear.java
View File

@@ -75,8 +75,8 @@ import java.util.List;
public class MasterClear extends InstrumentedPreferenceFragment {
private static final String TAG = "MasterClear";
private static final int KEYGUARD_REQUEST = 55;
private static final int CREDENTIAL_CONFIRM_REQUEST = 56;
@VisibleForTesting static final int KEYGUARD_REQUEST = 55;
@VisibleForTesting static final int CREDENTIAL_CONFIRM_REQUEST = 56;
static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
static final String ERASE_ESIMS_EXTRA = "erase_esim";
@@ -113,11 +113,16 @@ public class MasterClear extends InstrumentedPreferenceFragment {
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;
}

7
tests/robotests/src/com/android/settings/MasterClearTest.java
View File

@@ -167,6 +167,13 @@ public class MasterClearTest {
assertThat(mMasterClear.tryShowAccountConfirmation()).isFalse();
}
@Test
public void testIsValidRequestCode() {
assertThat(mMasterClear.isValidRequestCode(MasterClear.KEYGUARD_REQUEST)).isTrue();
assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST)).isTrue();
assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
}
private void initScrollView(int height, int scrollY, int childBottom) {
when(mScrollView.getHeight()).thenReturn(height);
when(mScrollView.getScrollY()).thenReturn(scrollY);