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

Commit 065fdb83 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Use... 

Merge "Use NetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) instead of NetworkCapabilities.isMetered() for Mainline"
am: fea772e3

Change-Id: I6de640aaa48de43d84eedcae1a352789a319af8e
parents d0466c0d fea772e3

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+4 −1
Original line number Diff line number Diff line
@@ -194,7 +194,10 @@ public class DcNetworkAgent extends NetworkAgent { 
            if (networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {

                // only log metrics for DataConnection with NET_CAPABILITY_INTERNET

                if (mNetworkCapabilities == null

                        || networkCapabilities.isMetered() != mNetworkCapabilities.isMetered()) {

                        || networkCapabilities.hasCapability(

                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)

                                        != mNetworkCapabilities.hasCapability(

                                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {

                    TelephonyMetrics.getInstance().writeNetworkCapabilitiesChangedEvent(

                            mPhone.getPhoneId(), networkCapabilities);

                }