diff options
| author | Martijn Coenen <maco@google.com> | 2022-05-13 04:44:56 +0000 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-06-20 10:27:07 +0000 |
| commit | 512a4fe71569d874def5d77bfc1e8dabfd65e423 (patch) | |
| tree | a51dd19ed5438a8658c89eb6f8a46efb2613c432 | |
| parent | 41bcf6803e641463a0fc850f4463bd314df25e8a (diff) | |
| download | base-512a4fe71569d874def5d77bfc1e8dabfd65e423.tar.gz | |
Add SDK level check to adding sandbox UIDs.
ConnectivityServiceTest builds against the latest Vpn framework code,
but when run on an older base image (eg 'S'), said framework code might
run into runtime errors calling new APIs. Until the test is decoupled,
do the SDK level check here.
Bug: 230548427
Bug: 232420362
Test: Build
Change-Id: If453e16e680f46cf2b9eb769e5607fb5513b32ac
(cherry picked from commit ab678b983bb4e1b5c724523d796f8cbcccabbc02)
Merged-In: If453e16e680f46cf2b9eb769e5607fb5513b32ac
| -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)); } } |