commit 351b45873db4a8206496c48dfb37b749025d5947
author Eric Enslen <enslen@google.com> Fri Feb 09 21:26:09 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 09 21:26:09 2018 +0000
tree 037e3cb9eb8d7e13aa00f92b31bc839442264801
parent b95b38ca3a8e9c682eeda7cf852d311858c50ab9
parent c81ef199549c552003e78a2b9383d5d38aaed8d0

fix isActiveNetworkMetered with VPNs
am: c81ef19954

Change-Id: I8d59bc23e9153c54e64af59816d11301b490c9eb

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