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

Commit c81ef199 authored by Eric Enslen's avatar Eric Enslen
Browse files

fix isActiveNetworkMetered with VPNs 

Bug: 72871435
Test: flashed and verified, also ran runtest framework-net

Change-Id: I69319a7db269489053426bb2d41574180be2d43d
parent 761ac5fd

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

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