commit ec7c68cb2b688f76b2957a46d138241390a01d66
author Chalard Jean <jchalard@google.com> Fri Mar 02 13:17:23 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 02 13:17:23 2018 +0000
tree 22b284917630bc3be6899578206e8a1679ea518c
parent 941de3f74c777af6a26de3049a0c3d606cafe931
parent 331e50f6016a102643c988f6c802efb2dbe22ffa

Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0
am: 331e50f601

Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 3021e6a..9c4feb4 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1387,7 +1387,8 @@
     public boolean isActiveNetworkMetered() {
         enforceAccessPermission();
 
-        final NetworkCapabilities caps = getNetworkCapabilities(getActiveNetwork());
+        final int uid = Binder.getCallingUid();
+        final NetworkCapabilities caps = getUnfilteredActiveNetworkState(uid).networkCapabilities;
         if (caps != null) {
             return !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
         } else {