aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2023-04-06 03:50:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-06 03:50:36 +0000
commit7605af8fd492db7bf37692ef2be8db190214ab9f (patch)
tree4ef2179fc0cd4459d0852ade7600afa2477c6be1
parent34271dcd528ae30ba0f113e4796711d042c13a32 (diff)
parent8b326db8f439500b7e17061363c50f49b830163c (diff)
downloadupdate_engine-7605af8fd492db7bf37692ef2be8db190214ab9f.tar.gz
Remove double filename logging am: b86f89cc81 am: 8b326db8f4
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2525821 Change-Id: I13cdc25a7a93c3bb33bc0e5d7b3ad960e8f80710 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--aosp/logging_android.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/aosp/logging_android.cc b/aosp/logging_android.cc
index 8b5465a0..5940f785 100644
--- a/aosp/logging_android.cc
+++ b/aosp/logging_android.cc
@@ -265,7 +265,7 @@ bool RedirectToLiblog(int severity,
} else {
// This will eventually be redirected to CombinedLogger.
// Use nullptr as tag so that liblog infers log tag from getprogname().
- if (file == nullptr || file[0] == 0 || line == 0) {
+ if (file == nullptr || file[0] == 0 || line == 0 || message_start != 0) {
__android_log_write(priority, nullptr /* tag */, str.c_str());
} else {
__android_log_print(priority,