diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml index 8f2874da783..9506fcc6e6f 100644 --- a/res/xml/app_data_usage.xml +++ b/res/xml/app_data_usage.xml @@ -34,7 +34,6 @@ + android:summary="@string/data_usage_app_restrict_mobile_summary" + settings:isPreferenceVisible="@bool/config_show_sim_info" /> @@ -73,6 +74,7 @@ android:key="unrestricted_data_saver" android:title="@string/unrestricted_app_title" android:summary="@string/unrestricted_app_summary" + settings:isPreferenceVisible="@bool/config_show_sim_info" settings:useAdditionalSummary="true" settings:restrictedSwitchSummary="@string/disabled_by_admin" /> diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index c727d06cc77..a2e91a5cc66 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -111,10 +111,6 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC private long mSelectedCycle; private boolean mIsLoading; - public boolean isSimHardwareVisible(Context context) { - return SubscriptionUtil.isSimHardwareVisible(context); - } - @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -157,7 +153,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC final UidDetailProvider uidDetailProvider = getUidDetailProvider(); if (mAppItem.key > 0) { - if ((!isSimHardwareVisible(mContext)) || !UserHandle.isApp(mAppItem.key)) { + if (!UserHandle.isApp(mAppItem.key)) { final UidDetail uidDetail = uidDetailProvider.getUidDetail(mAppItem.key, true); mIcon = uidDetail.icon; mLabel = uidDetail.label; @@ -338,9 +334,6 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC private void updatePrefs(boolean restrictBackground, boolean unrestrictData, boolean restrictAll, boolean restrictCellular, boolean restrictVpn, boolean restrictWifi, boolean hasInternetPermission) { - if (!isSimHardwareVisible(mContext)) { - return; - } setBackPreferenceListAnimatorIfLoaded(); final EnforcedAdmin admin = RestrictedLockUtilsInternal .checkIfMeteredDataUsageUserControlDisabled(mContext, mPackageName,