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

Commit 80051388 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am:... 

Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am: 104d96f9 am: 460af8c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695310

Change-Id: I58ca7ab8ba7678adbca160795cc0cb06a08fd5ed
parents 812ab290 460af8c9

core/java/android/net/NetworkIdentity.java

+4 −2
Original line number Diff line number Diff line
@@ -220,8 +220,10 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        String networkId = null;

        boolean roaming = !snapshot.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);

        boolean metered = !snapshot.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        boolean metered = !(snapshot.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)

                || snapshot.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED));



        final int oemManaged = getOemBitfield(snapshot.getNetworkCapabilities());