commit fa04c2d802f1a5c416961c4eda8fb8fd37b3cc8c
author Pavel Maltsev <pavelm@google.com> Sat Mar 03 00:03:37 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 03 00:03:37 2018 +0000
tree a5b95c6860c291f80a94a7afbb84deb82f60f810
parent ec7c68cb2b688f76b2957a46d138241390a01d66
parent 334cde1ec27c19f74f6b6eba2347c99bf9e33e29

Merge "Extend network request to query networks w/o capabilites" am: 47d4d15483
am: 334cde1ec2

Change-Id: Ie0c4fa4648c235589fecd79a25d28f1e62025fb7

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 {