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

Commit 6d7f8afe authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018,... 

Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release

Change-Id: Id07c91777f0b9ff3283ff1dfc53b5e1680c5f2f0
parents 58949a7d 8d2baf64

src/com/android/settings/MasterClear.java

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 
    void showFinalConfirmation() {

        final Bundle args = new Bundle();

        args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());

        args.putBoolean(ERASE_ESIMS_EXTRA,

            mEsimStorageContainer.getVisibility() == View.VISIBLE && mEsimStorage.isChecked());

        args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());

        new SubSettingLauncher(getContext())

                .setDestination(MasterClearConfirm.class.getName())

                .setArguments(args)

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class MasterClearTest { 
        verify(context).startActivity(intent.capture());

        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)

            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))

            .isFalse();

            .isTrue();

    }



    @Test