Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41505c9a authored by Aleksander Morgado's avatar Aleksander Morgado
Browse files

Use isMobileDataCapable helper in shortcut/ components 

Disabling telephony support may be done either with the
config_show_sim_info config option, or based on whether
TelephonyManager reports data capabilities. The isMobileDataCapable()
helper method ensures both ways are supported.

Bug: 395714454
Test: mm && atest
Flag: EXEMPT bugfix
Change-Id: I4ac756ddbb012ed4b81e3b637b7861877e0ef040
parent 7886ffb0

src/com/android/settings/shortcut/CreateShortcutPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ import com.android.settings.Settings; 
import com.android.settings.Settings.DataUsageSummaryActivity;

import com.android.settings.Settings.TetherSettingsActivity;

import com.android.settings.Settings.WifiTetherSettingsActivity;

import com.android.settings.Utils;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.gestures.OneHandedSettingsUtils;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.network.telephony.MobileNetworkUtils;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.wifi.WifiUtils;
@@ -204,7 +204,7 @@ public class CreateShortcutPreferenceController extends BasePreferenceController 


    @VisibleForTesting

    boolean canShowDataUsage() {

        return SubscriptionUtil.isSimHardwareVisible(mContext)

        return Utils.isMobileDataCapable(mContext)

                && !MobileNetworkUtils.isMobileNetworkUserRestricted(mContext);

    }