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

Commit fb327533 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Change default IP protocol preference from AUTO to IPV4" am: 4d3ac1d5 am: 9d98285e 

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



Change-Id: I7384900af28760974476807f5093e6938eb3ae92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 370fdbe3 9d98285e

services/core/java/com/android/server/connectivity/Vpn.java

+5 −2
Original line number Diff line number Diff line
@@ -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);