diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml index d2c8ca0d1bf..5502558fc3a 100644 --- a/res/xml/reset_dashboard_fragment.xml +++ b/res/xml/reset_dashboard_fragment.xml @@ -26,6 +26,7 @@ android:title="@string/reset_network_title" settings:userRestriction="no_network_reset" settings:useAdminDisabledSummary="true" + settings:isPreferenceVisible="@bool/config_show_sim_info" android:fragment="com.android.settings.ResetNetwork" /> diff --git a/src/com/android/settings/network/NetworkResetPreferenceController.java b/src/com/android/settings/network/NetworkResetPreferenceController.java index 58a5383f404..8842c618854 100644 --- a/src/com/android/settings/network/NetworkResetPreferenceController.java +++ b/src/com/android/settings/network/NetworkResetPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.network; import android.content.Context; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.network.SubscriptionUtil; import com.android.settingslib.core.AbstractPreferenceController; public class NetworkResetPreferenceController extends AbstractPreferenceController @@ -33,7 +34,8 @@ public class NetworkResetPreferenceController extends AbstractPreferenceControll @Override public boolean isAvailable() { - return !mRestrictionChecker.hasUserRestriction(); + return (SubscriptionUtil.isSimHardwareVisible(mContext) && + (!mRestrictionChecker.hasUserRestriction())); } @Override diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index c352b9292b1..aea92aafc90 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -24,6 +24,7 @@ import com.android.settings.applications.manageapplications.ResetAppPrefPreferen import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.EraseEuiccDataController; import com.android.settings.network.NetworkResetPreferenceController; +import com.android.settings.network.SubscriptionUtil; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -61,7 +62,9 @@ public class ResetDashboardFragment extends DashboardFragment { @Override public void onAttach(Context context) { super.onAttach(context); - use(EraseEuiccDataController.class).setFragment(this); + if (SubscriptionUtil.isSimHardwareVisible(context)) { + use(EraseEuiccDataController.class).setFragment(this); + } } @Override @@ -72,7 +75,9 @@ public class ResetDashboardFragment extends DashboardFragment { private static List buildPreferenceControllers(Context context, Lifecycle lifecycle) { final List controllers = new ArrayList<>(); - controllers.add(new NetworkResetPreferenceController(context)); + if (SubscriptionUtil.isSimHardwareVisible(context)) { + controllers.add(new NetworkResetPreferenceController(context)); + } controllers.add(new FactoryResetPreferenceController(context)); controllers.add(new ResetAppPrefPreferenceController(context, lifecycle)); return controllers;