Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351b4587 authored by Eric Enslen's avatar Eric Enslen Committed by android-build-merger
Browse files

fix isActiveNetworkMetered with VPNs 

am: c81ef199

Change-Id: I8d59bc23e9153c54e64af59816d11301b490c9eb
parents b95b38ca c81ef199

services/core/java/com/android/server/ConnectivityService.java

+2 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,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 {