| commit | 5d3490cc5eff6a0a66ef7f52797595f6be29a2e3 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 18 01:22:19 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 18 01:22:19 2025 -0700 |
| tree | 0238d8a260edcb03a88b46b410be60e904e6827f | |
| parent | c7a55d967b5f05f77bb3cc5a1854ebcf1fbc1684 [diff] | |
| parent | d983bc2bd90d21e87c2b0f4e5df81cee37bc13a5 [diff] |
Merge "Accept new OEM VPN types in netd." into main am: 293b0894d1 am: d983bc2bd9 Original change: https://android-review.googlesource.com/c/platform/system/netd/+/3543840 Change-Id: I13db9434203e4b6d6d76212ac976f86d886ca62b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp index 85112bb..b236242 100644 --- a/server/NetworkController.cpp +++ b/server/NetworkController.cpp
@@ -468,7 +468,7 @@ return -EEXIST; } - if (vpnType < NativeVpnType::SERVICE || NativeVpnType::OEM < vpnType) { + if (vpnType < NativeVpnType::SERVICE || NativeVpnType::OEM_LEGACY < vpnType) { ALOGE("invalid vpnType %d", static_cast<int>(vpnType)); return -EINVAL; }