Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev

src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java

@@ -33,6 +33,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.datausage.DataUsageUtils;
 import com.android.settings.network.MobileDataContentObserver;
 import com.android.settings.network.SubscriptionsChangeListener;
 
@@ -102,10 +103,16 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen
         return true;
     }
 
+    @VisibleForTesting
+    protected boolean hasMobileData() {
+        return DataUsageUtils.hasMobileData(mContext);
+    }
+
     @Override
     public int getAvailabilityStatus(int subId) {
         if (!SubscriptionManager.isValidSubscriptionId(subId)
-                || SubscriptionManager.getDefaultDataSubscriptionId() == subId) {
+                || SubscriptionManager.getDefaultDataSubscriptionId() == subId
+                || (!hasMobileData())) {
             return CONDITIONALLY_UNAVAILABLE;
         }
         return AVAILABLE;

src/com/android/settings/network/telephony/DataUsagePreferenceController.java

@@ -56,6 +56,7 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
     @Override
     public int getAvailabilityStatus(int subId) {
         return (SubscriptionManager.isValidSubscriptionId(subId))
+                && DataUsageUtils.hasMobileData(mContext)
                 ? AVAILABLE
                 : AVAILABLE_UNSEARCHABLE;
     }