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

Commit a5c89fe0 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 26d4f3dc: am 4c3de54d: Merge "Roaming always metered, relax DHCP metered check." into jb-dev 

* commit '26d4f3dc':
  Roaming always metered, relax DHCP metered check.
parents dadd97bb 26d4f3dc

core/java/android/net/DhcpInfoInternal.java

+5 −1
Original line number Diff line number Diff line
@@ -147,7 +147,11 @@ public class DhcpInfoInternal { 
     * metered, and sensitive to heavy data transfers.

     */

    public boolean hasMeteredHint() {

        return "ANDROID_METERED".equals(vendorInfo);

        if (vendorInfo != null) {

            return vendorInfo.contains("ANDROID_METERED");

        } else {

            return false;

        }

    }



    public String toString() {

services/java/com/android/server/net/NetworkPolicyManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -1497,6 +1497,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    public boolean isNetworkMetered(NetworkState state) {

        final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);



        // roaming networks are always considered metered

        if (ident.getRoaming()) {

            return true;

        }



        final NetworkPolicy policy;

        synchronized (mRulesLock) {

            policy = findPolicyForNetworkLocked(ident);