LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f8833a502cfa4674190509300eb378c4072efcc
This commit is contained in:
Paul Hu
2021-01-22 14:53:33 +00:00
committed by Automerger Merge Worker
parent b97f23ae96 85aad57203
commit 12fbbf4145
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -5714,9 +5714,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Policy already enforced. // Policy already enforced.
return; return;
} }
if (mPolicyManagerInternal.isUidRestrictedOnMeteredNetworks(uid)) { final long ident = Binder.clearCallingIdentity();
// If UID is restricted, don't allow them to bring up metered APNs. try {
networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED); 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);
} }
} }