| commit | 49e82435f0863be51e28b94bf244acce3831ea7c | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Apr 12 20:30:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 12 20:30:13 2023 +0000 |
| tree | 71b3281d72f0ee42fb3bfa6a67c0ff4648d1cbb7 | |
| parent | a10c0c99a7fa9b99e8b7a4c77d149e8fdfbfdcaf [diff] | |
| parent | 5ff877e3b78cc58fadeb8d3d6ec15d1c8286fea5 [diff] |
Merge "Revert "temporarily remove abort() to facilitate debugging"" am: a0ea747183 am: 5ff877e3b7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2530439 Change-Id: I98719c386548a1a32d6f1fdf04301ac76a927f85 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 dfc9ffc..dbb12ee 100644 --- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp +++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -51,7 +51,7 @@ namespace android { -#define ALOGF(s ...) do { ALOGE(s); } while(0) +#define ALOGF(s ...) do { ALOGE(s); abort(); } while(0) enum verify { VERIFY_DIR, VERIFY_BIN, VERIFY_PROG, VERIFY_MAP_RO, VERIFY_MAP_RW };