Merge "Fix erasing of eSIMs for some devices" into qt-dev

am: 1f942d9857

Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf

src/com/android/settings/MasterClear.java

@@ -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

@@ -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