Merge "Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7dcb am: d0091f2a1c" into tm-dev-plus-aosp

2022-05-13 10:23:30 +00:00
parent 5dbdb17da1 20e78088c1
commit a1979fa87b
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1629,7 +1629,9 @@ public class Vpn {
        for (String app : packageNames) {
            int uid = getAppUid(app, userId);
            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));
            }
        }