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

Merge "AF/FR Fix onActivityResult condition."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-23 20:29:36 +00:00
committed by Android (Google) Code Review
parent 0608d2dc9d 5dd6ed470e
commit e1bf0aae82
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ import java.util.List;
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 @@ 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

@@ -270,6 +270,13 @@ public class MasterClearTest {
assertThat(mMasterClear.tryShowAccountConfirmation()).isTrue();
}
@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);