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

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

fix isActiveNetworkMetered with VPNs am: c81ef199 

am: 351b4587

Change-Id: I177eff1237dd59514ccf91397a3d307148bc37b1
parents 83137d6e 351b4587

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

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