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" am: 4d3ac1d568 am: 9d98285e86

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583732

Change-Id: I7384900af28760974476807f5093e6938eb3ae92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-05-11 09:07:18 +00:00
committed by Automerger Merge Worker
parent 370fdbe3bc 9d98285e86
commit fb3275336c
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;
break;
default:
ipVersion = IkeSessionParams.ESP_IP_VERSION_AUTO;
encapType = IkeSessionParams.ESP_ENCAP_TYPE_AUTO;
// By default, PREFERRED_IKE_PROTOCOL_IPV4_UDP is used for safety. This is
// 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;
}
return new CarrierConfigInfo(mccMnc, natKeepalive, encapType, ipVersion);