Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change default IP protocol preference from AUTO to IPV4" into udc-dev

Browse Source
This commit is contained in:
Chiachang Wang
2023-05-11 14:00:49 +00:00
committed by Android (Google) Code Review
parent e8499938be 5b97250dca
commit 4ca1887dd7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -3677,8 +3677,11 @@ public class Vpn {
encapType = IkeSessionParams.ESP_ENCAP_TYPE_NONE; encapType = IkeSessionParams.ESP_ENCAP_TYPE_NONE;
break; break;
default: default:
ipVersion = IkeSessionParams.ESP_IP_VERSION_AUTO; // By default, PREFERRED_IKE_PROTOCOL_IPV4_UDP is used for safety. This is
encapType = IkeSessionParams.ESP_ENCAP_TYPE_AUTO; // because some carriers' networks do not support IPv6 very well, and using
// IPv4 can help to prevent problems.
ipVersion = IkeSessionParams.ESP_IP_VERSION_IPV4;
encapType = IkeSessionParams.ESP_ENCAP_TYPE_UDP;
break; break;
} }
return new CarrierConfigInfo(mccMnc, natKeepalive, encapType, ipVersion); return new CarrierConfigInfo(mccMnc, natKeepalive, encapType, ipVersion);