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

Commit 604c7a7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove the option of resetting Euicc data."

parents 6eb702ed 86021620

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

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network;



import android.content.Context;

import android.content.pm.PackageManager;

import android.text.TextUtils;



import androidx.preference.Preference;
@@ -50,6 +51,8 @@ public class EraseEuiccDataController extends BasePreferenceController { 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE_UNSEARCHABLE;

        return mContext.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE

                : UNSUPPORTED_ON_DEVICE;

    }

}

tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import com.android.settings.core.BasePreferenceController;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -42,6 +43,7 @@ public class EraseEuiccDataControllerTest { 
        mController = new EraseEuiccDataController(context, ERASE_EUICC_DATA_PREFERENCE_KEY);

    }



    @Ignore("Will not work on devices without FEATURE_TELEPHONY_EUICC")

    @Test

    public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {

        assertThat(mController.getAvailabilityStatus())