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

Commit 7784d2cd authored by Eric Enslen's avatar Eric Enslen Committed by Chalard Jean
Browse files

fix isActiveNetworkMetered with VPNs 

Clean cherry-pick of ag/3580901
Bug: 72871435
Test: flashed and verified, also ran runtest framework-net
Merged-In: I177eff1237dd59514ccf91397a3d307148bc37b1

Change-Id: Ic5919a32f91f7baee5f1370703ad166e6ea52b58
parent 1f392c46

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

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