| commit | 5ef6e587c15b6fa32bd909c89a8a118d4704f968 | [log] [tgz] |
|---|---|---|
| author | Peter Wang <tpwang@google.com> | Thu Mar 25 21:36:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 21:36:39 2021 +0000 |
| tree | 80819a871194c210992d594afdc840994fc6c95d | |
| parent | 204f35dc58aba2302f5c1c3194be232a603b5e82 [diff] | |
| parent | 2f30e9107a6c8be58f87114750350f8e24514509 [diff] |
Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068 Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
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); }