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

Commit f398d998 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Define and use default request in Ikev2VpnRunner" am: d4235a81 am:...

Merge "Define and use default request in Ikev2VpnRunner" am: d4235a81 am: 1a2d80e2 am: 1cf1feee am: a5c7db78

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

Change-Id: I9a1620dec21f49a52d49e6b6c5538c9cd5387d83
parents 37367e7a a5c7db78
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -2407,7 +2407,14 @@ public class Vpn {
                        .addTransportType(NetworkCapabilities.TRANSPORT_TEST)
                        .build();
            } else {
                req = cm.getDefaultRequest();
                // Basically, the request here is referring to the default request which is defined
                // in ConnectivityService. Ideally, ConnectivityManager should provide an new API
                // which can provide the status of physical network even though there is a virtual
                // network. b/147280869 is used for tracking the new API.
                // TODO: Use the new API to register default physical network.
                req = new NetworkRequest.Builder()
                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                        .build();
            }

            cm.requestNetwork(req, mNetworkCallback);