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

Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a

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

Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
This commit is contained in:
Peter Wang
2021-03-25 21:36:39 +00:00
committed by Automerger Merge Worker
parent 204f35dc58 2f30e9107a
commit 5ef6e587c1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/EraseEuiccDataController.java
View File

@@ -28,8 +28,7 @@ import com.android.settings.system.ResetDashboardFragment;
/** /**
* Controller for erasing Euicc data * Controller for erasing Euicc data
*/ */
public class EraseEuiccDataController extends BasePreferenceController implements public class EraseEuiccDataController extends BasePreferenceController {
PreferenceControllerMixin {
private ResetDashboardFragment mHostFragment; private ResetDashboardFragment mHostFragment;
public EraseEuiccDataController(Context context, String preferenceKey) { public EraseEuiccDataController(Context context, String preferenceKey) {

2
src/com/android/settings/network/EraseEuiccDataDialogFragment.java
View File

@@ -67,7 +67,7 @@ public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment imp
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Fragment fragment = getTargetFragment(); final Fragment fragment = getTargetFragment();
if (!(fragment instanceof ResetDashboardFragment)) { if (!(fragment instanceof ResetDashboardFragment)) {
Log.e(TAG, "getTargetFragment return unexpected type"); Log.e(TAG, "getTargetFragment return unexpected type");
} }

2
tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
View File

@@ -43,7 +43,7 @@ public class EraseEuiccDataControllerTest {
} }
@Test @Test
public void getAvailabilityStatus_byDefault_true() { public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
} }