diff options
| author | 2022-06-20 12:37:34 +0000 | |
|---|---|---|
| committer | 2022-06-20 12:37:34 +0000 | |
| commit | 0cb02dc1042e2099eee9df9cc0c7f71e51270dbd (patch) | |
| tree | 52a99dd6b9e6700c73d25089a46bb4ea9c638ee6 | |
| parent | 48eeb3b02958f2f95f34fdbb3036b3a24a54922d (diff) | |
| parent | 512a4fe71569d874def5d77bfc1e8dabfd65e423 (diff) | |
Add SDK level check to adding sandbox UIDs. am: 512a4fe715
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992911
Change-Id: Ic1b1143210e02e1f9ee14810753d043ff96d0b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 3551ff91f542..77d3392da993 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1646,7 +1646,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)); } } |