commit d98aec5eeeb46d4ded5ad65ba371fc8cc669f160
author Chalard Jean <jchalard@google.com> Fri Mar 02 12:46:46 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 02 12:46:46 2018 +0000
tree 49bc925916efc9e602ae37f030e55c326e4519a5
parent 7f245b1f7141a54ba1bb0e74dc9c4dc5791a036e
parent 58c3355b8f10d9b50d08337c2242c9c6329c1457

Merge "Give VPNs the INTERNET capability when they route most of the IP space" am: ef307293e5
am: 58c3355b8f

Change-Id: I33c6fcc72753e00af601cf915aa78416174a3871

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 fd2ef18..f2871e0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1379,7 +1379,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 {