Merge "Fix coding styles for erase euicc only options"

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

@@ -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

@@ -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

@@ -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);
     }