Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add SDK level check to adding sandbox UIDs."

Browse Source
This commit is contained in:
Martijn Coenen
2022-05-13 08:26:02 +00:00
committed by Gerrit Code Review
parent dca2e07727 ab678b983b
commit e202bd7dcb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1629,7 +1629,9 @@ public class Vpn {
for (String app : packageNames) { for (String app : packageNames) {
int uid = getAppUid(app, userId); int uid = getAppUid(app, userId);
if (uid != -1) uids.add(uid); if (uid != -1) uids.add(uid);
if (Process.isApplicationUid(uid)) { // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from
// ConnectivityServiceTest.
if (Process.isApplicationUid(uid) && SdkLevel.isAtLeastT()) {
uids.add(Process.toSdkSandboxUid(uid)); uids.add(Process.toSdkSandboxUid(uid));
} }
} }