| commit | e1da0041e0f1dffa16b8a6ff9443d51507243326 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon May 02 14:53:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 14:53:53 2022 +0000 |
| tree | 2d308d5527748bc368223cdaa145324075dd7320 | |
| parent | 87f4d52d9f6bcec6340162d1d1c9a9035553505b [diff] | |
| parent | 6867bb686e741c1719186379c1fa8caf8786dfa7 [diff] |
Merge "remove spurious ifdef POSIX_SPAWN_CLOEXEC_DEFAULT" am: 6867bb686e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2081620 Change-Id: I5ab2c766f7d9a27377a9287d12be0314e89390c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp index ba836b2..e2c5a63 100644 --- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp +++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -315,10 +315,7 @@ // TODO: use android::base::ScopeGuard. if (int ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_USEVFORK -#ifdef POSIX_SPAWN_CLOEXEC_DEFAULT - | POSIX_SPAWN_CLOEXEC_DEFAULT -#endif - )) { + | POSIX_SPAWN_CLOEXEC_DEFAULT)) { posix_spawnattr_destroy(&attr); throwIOException(env, "posix_spawnattr_setflags failed", ret); return -1;