| commit | d3db03b520b1705aaa22082ec29698d49d66ae18 | [log] [tgz] |
|---|---|---|
| author | Peter Wang <tpwang@google.com> | Thu Mar 25 20:14:54 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 25 20:14:54 2021 +0000 |
| tree | dddfdd8c7525f23370000151f81d8eaa8bb911d2 | |
| parent | 3fbb8612f5a0732cf1a889f80efb49fc5f9d5648 [diff] | |
| parent | 5babfac3d157643e87886d52d7824c285cb31921 [diff] |
Merge "Fix coding styles for erase euicc only options"
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java index d221fbd..7d71096 100644 --- a/src/com/android/settings/network/EraseEuiccDataController.java +++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -28,8 +28,7 @@ /** * 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) {
diff --git a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java index 3aee9b1..a141f0c 100644 --- a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java +++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -67,7 +67,7 @@ @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"); }
diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java index 15e4708..879b9f7 100644 --- a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java +++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -43,7 +43,7 @@ } @Test - public void getAvailabilityStatus_byDefault_true() { + public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() { assertThat(mController.getAvailabilityStatus()) .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); }