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

Commit 96491460 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev 

am: efd3a174

* commit 'efd3a174':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I5cd9701e6620abcc950f6a182b6e2b5f95127371
parents 9c14d14f efd3a174

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -4066,7 +4066,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            synchronized(mRulesLock) {

            synchronized(mRulesLock) {

                uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);

                uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);

            }

            }

            if ((uidRules & RULE_ALLOW_ALL) == 0) {

            if (mRestrictBackground && (uidRules & RULE_ALLOW_METERED) == 0

                    && (uidRules & RULE_TEMPORARY_ALLOW_METERED) == 0) {

                // we could silently fail or we can filter the available nets to only give

                // we could silently fail or we can filter the available nets to only give

                // them those they have access to.  Chose the more useful option.

                // them those they have access to.  Chose the more useful option.

                networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);

                networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);