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

Commit 6d49dc35 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents ef6c188b f0806f17
Loading
Loading
Loading
Loading
+22 −2
Original line number Diff line number Diff line
@@ -516,9 +516,18 @@ public class EnabledNetworkModePreferenceController extends
                    }
                }
                break;
            case TelephonyManager.NETWORK_MODE_NR_ONLY:
            case TelephonyManager.NETWORK_MODE_NR_LTE:
            case TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA:
            case TelephonyManager.NETWORK_MODE_NR_LTE_WCDMA:
                preference.setValue(
                        Integer.toString(TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA));
                preference.setSummary(mContext.getString(R.string.network_5G)
                        + mContext.getString(R.string.network_recommended));
                break;
            case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO:
            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                preference.setValue(Integer.toString(networkMode));
                preference.setValue(
                        Integer.toString(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO));
                preference.setSummary(mContext.getString(R.string.network_5G)
                        + mContext.getString(R.string.network_recommended));
                break;
@@ -534,6 +543,17 @@ public class EnabledNetworkModePreferenceController extends
                            + mContext.getString(R.string.network_recommended));
                }
                break;
            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA:
            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
            case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                preference.setValue(
                        Integer.toString(TelephonyManager
                                .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
                preference.setSummary(mContext.getString(R.string.network_5G)
                        + mContext.getString(R.string.network_recommended));
                break;
            default:
                preference.setSummary(
                        mContext.getString(R.string.mobile_network_mode_error, networkMode));