From 97f91da84aeb767c53a048fea4845963e751aea1 Mon Sep 17 00:00:00 2001
From: Shuo Qian <shuoq@google.com>
Date: Mon, 6 Jan 2020 16:59:36 -0800
Subject: [PATCH] Use
 NetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
 instead of NetworkCapabilities.isMetered() for Mainline

Test: Treehugger; no function change
Bug: 147017757
Change-Id: I9c5b520ba0fad2d788d74f4638a99f6604c58011
---
 .../internal/telephony/dataconnection/DcNetworkAgent.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java b/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
index 87152f2420..0a3a84ce26 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
@@ -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);
                 }
-- 
GitLab