From 597aed929ba0caa17d80d0da233992309739c0d3 Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Wed, 9 Mar 2022 07:58:43 +0000
Subject: [PATCH] Split updateMeteredNetwork{Allow, Deny}List into add and
 remove

Bug: 218494748
Test: atest FrameworksNetTests
Fix: 223503886

Change-Id: I06fdf88a6b6988377478665389f307ea7269bbf1
Merged-in: I06fdf88a6b6988377478665389f307ea7269bbf1
---
 .../com/android/server/NetworkManagementService.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index b59cd4c0f212c..1a39ffa393b37 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1166,9 +1166,17 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
             final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
             try {
                 if (allowlist) {
-                    cm.updateMeteredNetworkAllowList(uid, enable);
+                    if (enable) {
+                        cm.addUidToMeteredNetworkAllowList(uid);
+                    } else {
+                        cm.removeUidFromMeteredNetworkAllowList(uid);
+                    }
                 } else {
-                    cm.updateMeteredNetworkDenyList(uid, enable);
+                    if (enable) {
+                        cm.addUidToMeteredNetworkDenyList(uid);
+                    } else {
+                        cm.removeUidFromMeteredNetworkDenyList(uid);
+                    }
                 }
                 synchronized (mRulesLock) {
                     if (enable) {