Merge changes from topics "vpnmove-getconnectionowneruid",...
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 250855cb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I83b4210780cf87006be5f55439ade06cd7893530
No related branches found
No related tags found
Showing
- core/api/module-lib-current.txt 1 addition, 0 deletionscore/api/module-lib-current.txt
- core/java/android/net/VpnTransportInfo.java 79 additions, 0 deletionscore/java/android/net/VpnTransportInfo.java
- core/proto/android/net/networkrequest.proto 3 additions, 0 deletionscore/proto/android/net/networkrequest.proto
- packages/Connectivity/framework/src/android/net/ConnectivityManager.java 52 additions, 14 deletions...tivity/framework/src/android/net/ConnectivityManager.java
- packages/Connectivity/framework/src/android/net/NetworkCapabilities.java 2 additions, 0 deletions...tivity/framework/src/android/net/NetworkCapabilities.java
- packages/Connectivity/framework/src/android/net/NetworkRequest.java 11 additions, 11 deletions...onnectivity/framework/src/android/net/NetworkRequest.java
- packages/Connectivity/framework/src/android/net/VpnManager.java 19 additions, 3 deletions...es/Connectivity/framework/src/android/net/VpnManager.java
- services/core/java/com/android/server/ConnectivityService.java 34 additions, 28 deletions...ces/core/java/com/android/server/ConnectivityService.java
- services/core/java/com/android/server/connectivity/NetworkAgentInfo.java 2 additions, 1 deletion...ava/com/android/server/connectivity/NetworkAgentInfo.java
- services/core/java/com/android/server/connectivity/Vpn.java 19 additions, 13 deletionsservices/core/java/com/android/server/connectivity/Vpn.java
- tests/net/java/android/net/ConnectivityManagerTest.java 11 additions, 0 deletionstests/net/java/android/net/ConnectivityManagerTest.java
- tests/net/java/android/net/VpnTransportInfoTest.java 51 additions, 0 deletionstests/net/java/android/net/VpnTransportInfoTest.java
- tests/net/java/com/android/server/ConnectivityServiceTest.java 49 additions, 11 deletions.../net/java/com/android/server/ConnectivityServiceTest.java
- tests/net/java/com/android/server/connectivity/VpnTest.java 14 additions, 1 deletiontests/net/java/com/android/server/connectivity/VpnTest.java
Loading
Please register or sign in to comment