OSDN Git Service

Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am:...
authorChalard Jean <jchalard@google.com>
Fri, 2 Mar 2018 13:25:02 +0000 (13:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Mar 2018 13:25:02 +0000 (13:25 +0000)
commitd1bf7733afd26c97321ab43384badb3eb9924283
tree98e287cd8652b418568670f86fbadfaaf89ad48b
parent9fae0a82af2be32a6d29001457f686f27e551c4e
parent1be320a494cd292235d16ce4d155bfb858eaadf0
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am: e5e819f078
am: 1be320a494

Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
core/java/android/net/NetworkCapabilities.java
core/java/android/net/NetworkRequest.java
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/android/net/NetworkCapabilitiesTest.java
tests/net/java/com/android/server/ConnectivityServiceTest.java