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

Commit 3091978e authored by Peter Wang's avatar Peter Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix coding styles for erase euicc only options" into sc-dev am: 3f7d415e 

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

Change-Id: I72404bc62312ee671238323332b970fad54d1510
parents d53fa89b 3f7d415e

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
@@ -45,7 +45,7 @@ public class EraseEuiccDataControllerTest { 
    }



    @Test

    public void getAvailabilityStatus_byDefault_true() {

    public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {

        assertThat(mController.getAvailabilityStatus())

                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);

    }