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

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

Browse Source 
am: 1f942d9857

Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3
This commit is contained in:
Andrew Sapperstein
2019-07-11 20:51:33 -07:00
committed by android-build-merger
parent 1da3bf10bf 1f942d9857
commit 8c6b2bafb0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,8 +182,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
void showFinalConfirmation() { void showFinalConfirmation() {
final Bundle args = new Bundle(); final Bundle args = new Bundle();
args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked()); args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
args.putBoolean(ERASE_ESIMS_EXTRA, args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
mEsimStorageContainer.getVisibility() == View.VISIBLE && mEsimStorage.isChecked());
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(MasterClearConfirm.class.getName()) .setDestination(MasterClearConfirm.class.getName())
.setArguments(args) .setArguments(args)

2
tests/robotests/src/com/android/settings/MasterClearTest.java
View File

@@ -163,7 +163,7 @@ public class MasterClearTest {
verify(context).startActivity(intent.capture()); verify(context).startActivity(intent.capture());
assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
.getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)) .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
.isFalse(); .isTrue();
} }
@Test @Test