Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1bf0aae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AF/FR Fix onActivityResult condition."

parents 0608d2dc 5dd6ed47

src/com/android/settings/MasterClear.java

+7 −2
Original line number Diff line number Diff line
@@ -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;

        }

tests/robotests/src/com/android/settings/MasterClearTest.java

+7 −0
Original line number Diff line number Diff line
@@ -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);