commit 604c7a7cfa327a60b091790af56a39393681f703
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 09 10:09:30 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 09 10:09:30 2021 +0000
tree 73af27704d17c60a2cd8f15137fe439c858e482f
parent 6eb702ed637e75f57220007226e72b21cafad033
parent 860216208f188703957301ae8054f0f8c8b931f3

Merge "Remove the option of resetting Euicc data."

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

diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 7d71096..b1f964b 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -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 @@
 
     @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

diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
index 879b9f7..e3fea83 100644
--- a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -26,6 +26,7 @@
 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 @@
         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())