From c81ef199549c552003e78a2b9383d5d38aaed8d0 Mon Sep 17 00:00:00 2001 From: Eric Enslen Date: Wed, 7 Feb 2018 18:03:53 -0800 Subject: [PATCH] fix isActiveNetworkMetered with VPNs Bug: 72871435 Test: flashed and verified, also ran runtest framework-net Change-Id: I69319a7db269489053426bb2d41574180be2d43d --- services/core/java/com/android/server/ConnectivityService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 9afa825a7d37..c1801b80af0d 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1339,7 +1339,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 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 { -- 2.11.0