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

Commit 20f8025a authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Split updateMeteredNetwork{Allow, Deny}List into add and remove" am:... 

Merge "Split updateMeteredNetwork{Allow, Deny}List into add and remove" am: 92381c68 am: 60bc7d68

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

Change-Id: Ia5be9ded83e8fbf6964cc39e5efc9fb0fa2a662c
parents 939cf509 60bc7d68

services/core/java/com/android/server/NetworkManagementService.java

+10 −2
Original line number Diff line number Diff line
@@ -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) {