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

Change default IP protocol preference from AUTO to IPV4

Browse Source 
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.

Carrierconfig customization on the device should override the
value if V6 are known to work well.

Bug: 269714970
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:4a3406799000e8f81b4b54cd8ba43bd8f8bd029b)
Merged-In: Ia0a6bd11d25fd67edb0a301e81626ec4f174155a
Change-Id: Ia0a6bd11d25fd67edb0a301e81626ec4f174155a
This commit is contained in:
chiachangwang
2023-05-11 02:42:59 +00:00
committed by Cherrypicker Worker
parent 3b1304d65c
commit 5b97250dca
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);