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

Commit ebea7426 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I6194592d,I5a02f847 am: 44146c8e 

Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
parents b6fa2277 44146c8e

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

+8 −3
Original line number Diff line number Diff line
@@ -82,13 +82,18 @@ public class NrDisabledInDsdsFooterPreferenceController extends BasePreferenceCo 
        final TelephonyManager teleManager = ((TelephonyManager)

                mContext.getSystemService(Context.TELEPHONY_SERVICE))

                .createForSubscriptionId(mSubId);

        final SubscriptionManager subManager = ((SubscriptionManager)

                mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE));

        final int[] activeSubIdList = subManager.getActiveSubscriptionIdList();

        final int activeSubCount = activeSubIdList == null ? 0 : activeSubIdList.length;

        // Show the footer only when DSDS is enabled, and mobile data is enabled on this SIM, and

        // 5G is supported on this device.

        if (!teleManager.isDataEnabled() || teleManager.getActiveModemCount() < 2

                || !is5GSupportedByRadio(teleManager)) {

        if (teleManager.isDataEnabled() && activeSubCount >= 2 && is5GSupportedByRadio(teleManager)

                && !teleManager.canConnectTo5GInDsdsMode()) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

        return AVAILABLE;

    }



    private boolean is5GSupportedByRadio(TelephonyManager tm) {