Merge "Update the wording for subsequent pair devices in Settings." into main
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 3dc3ab5..9892f0d 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -18,10 +18,12 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.os.UserManager;
import android.text.TextUtils;
import androidx.preference.Preference;
+import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.telephony.MobileNetworkUtils;
@@ -33,8 +35,11 @@
public class EraseEuiccDataController extends BasePreferenceController {
private ResetDashboardFragment mHostFragment;
+ private final UserManager mUm;
+
public EraseEuiccDataController(Context context, String preferenceKey) {
super(context, preferenceKey);
+ mUm = context.getSystemService(UserManager.class);
}
public void setFragment(ResetDashboardFragment hostFragment) {
@@ -52,10 +57,12 @@
@Override
public int getAvailabilityStatus() {
- return SubscriptionUtil.isSimHardwareVisible(mContext) &&
- (!MobileNetworkUtils.isMobileNetworkUserRestricted(mContext)) &&
- mContext.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
- : UNSUPPORTED_ON_DEVICE;
+ boolean isAllowedUser = (mUm.isAdminUser() || Utils.isDemoUser(mContext))
+ && !MobileNetworkUtils.isMobileNetworkUserRestricted(mContext);
+ boolean hasEuiccFeature = mContext.getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_TELEPHONY_EUICC);
+ return SubscriptionUtil.isSimHardwareVisible(mContext)
+ && isAllowedUser
+ && hasEuiccFeature ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
}