Merge "UEventObserver: Fix logging for uevent messages" into main

2023-07-06 22:07:10 +00:00
parent 60a6004712 50cf7b3722
commit 8da769b01d
1 changed files with 5 additions and 1 deletions
--- a/core/jni/android_os_UEventObserver.cpp
+++ b/core/jni/android_os_UEventObserver.cpp
@@ -71,7 +71,11 @@ static jstring nativeWaitForNextEvent(JNIEnv *env, jclass clazz) {
        }
        buffer[length] = '\0';

-        ALOGV("Received uevent message: %s", buffer);
+        IF_ALOGV() {
+            std::string message(buffer, length);
+            std::replace(message.begin(), message.end(), '\0', ' ');
+            ALOGV("Received uevent message: %s", message.c_str());
+        }

        if (isMatch(buffer, length)) {
            // Assume the message is ASCII.