diff options
| author | Eric Enslen <enslen@google.com> | 2018-02-07 18:03:53 -0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-09 21:28:07 +0000 |
| commit | db0f5100c9bdf8d0d26554f8e4aa3d4238757cb3 (patch) | |
| tree | 2ea54e42c0568fd844c66202f5b785e305398363 | |
| parent | 0748edce4a8741611d0d856534ec8a5abeb920e5 (diff) | |
| download | base-db0f5100c9bdf8d0d26554f8e4aa3d4238757cb3.tar.gz | |
fix isActiveNetworkMetered with VPNs
Bug: 72871435
Test: flashed and verified, also ran runtest framework-net
Change-Id: I69319a7db269489053426bb2d41574180be2d43d
(cherry picked from commit c81ef199549c552003e78a2b9383d5d38aaed8d0)
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 { |