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

Commit b07cee31 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d98 

am: 44f731c1

Change-Id: I34bb2383b9f14e624ab93caa0108d2a2510f4439
parents 00c05fc2 44f731c1

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