commit 12fbbf414544314282671feafebe13a0309f6cb8
author Paul Hu <paulhu@google.com> Fri Jan 22 14:53:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 22 14:53:33 2021 +0000
tree 66366a0c8a324a1149d306a67261336fdfb67997
parent b97f23ae96859b4cf20ec36ae6ac556a1ea7ec6e
parent 85aad57203521b1bb94ac6e557c0ad29bbfc5df5

Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" am: 85aad57203

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f8833a502cfa4674190509300eb378c4072efcc

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1da263c..b6232a0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5714,9 +5714,14 @@
             // Policy already enforced.
             return;
         }
-        if (mPolicyManagerInternal.isUidRestrictedOnMeteredNetworks(uid)) {
-            // If UID is restricted, don't allow them to bring up metered APNs.
-            networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);
+        final long ident = Binder.clearCallingIdentity();
+        try {
+            if (mPolicyManager.isUidRestrictedOnMeteredNetworks(uid)) {
+                // If UID is restricted, don't allow them to bring up metered APNs.
+                networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(ident);
         }
     }