Merge "Define and use default request in Ikev2VpnRunner"
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 0a71ecb..94c1b54 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -2407,7 +2407,14 @@
.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);