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

Commit 2f30e910 authored Mar 25, 2021 by Peter Wang Committed by Automerger Merge Worker Mar 25, 2021

Merge "Fix coding styles for erase euicc only options" am: d3db03b5

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I0d7be5bf2e40af9a0c345be284a5bcc2058ebc8e

parents 3cac9507 d3db03b5

src/com/android/settings/network/EraseEuiccDataController.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -28,8 +28,7 @@ import com.android.settings.system.ResetDashboardFragment;
		/**
		* Controller for erasing Euicc data
		*/
		public class EraseEuiccDataController extends BasePreferenceController implements
		PreferenceControllerMixin {
		public class EraseEuiccDataController extends BasePreferenceController {
		private ResetDashboardFragment mHostFragment;

		public EraseEuiccDataController(Context context, String preferenceKey) {

src/com/android/settings/network/EraseEuiccDataDialogFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment imp

		@Override
		public void onClick(DialogInterface dialog, int which) {
		Fragment fragment = getTargetFragment();
		final Fragment fragment = getTargetFragment();
		if (!(fragment instanceof ResetDashboardFragment)) {
		Log.e(TAG, "getTargetFragment return unexpected type");
		}

tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public class EraseEuiccDataControllerTest {
		}

		@Test
		public void getAvailabilityStatus_byDefault_true() {
		public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {
		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
		}