diff options
| author | 2022-06-20 12:55:41 +0000 | |
|---|---|---|
| committer | 2022-06-20 12:55:41 +0000 | |
| commit | 91136787f617838c94577390a1704e91a9dd8d3c (patch) | |
| tree | 39fe44462b416cc4f8aec62f5c0c3bbd4ea01975 | |
| parent | b692b421455073345cf917f07905b8474764929d (diff) | |
| parent | 2c3b5487e92098139562b5586f34cb3763ee6470 (diff) | |
Add SDK level check to adding sandbox UIDs. am: 512a4fe715 am: 2c3b5487e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992911
Change-Id: Ic5ae416533da01fe925875e8b050630967f8c090
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)); } } |