From 9a2d8d8f56428a20ac6b6456a06b92abfb4f651c Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Mon, 13 Dec 2021 19:39:19 +0000 Subject: [PATCH] Avoid spurious UsbAlsaJackDetector JNI log Return the result of jniRegisterNativeMethods directly when registering JNI methods for UsbAlsaJackDetector. The current implementation incorrectly logs an error upon success. Change-Id: I45ebc110191da0d7deda0ff7f5ed66d13e62732b Test: m + validate removed log BUG: 199520597 --- .../core/jni/com_android_server_UsbAlsaJackDetector.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/services/core/jni/com_android_server_UsbAlsaJackDetector.cpp b/services/core/jni/com_android_server_UsbAlsaJackDetector.cpp index ccb4f5995330f..1c574fbb8df70 100644 --- a/services/core/jni/com_android_server_UsbAlsaJackDetector.cpp +++ b/services/core/jni/com_android_server_UsbAlsaJackDetector.cpp @@ -151,13 +151,8 @@ int register_android_server_UsbAlsaJackDetector(JNIEnv *env) return -1; } - if (!jniRegisterNativeMethods(env, "com/android/server/usb/UsbAlsaJackDetector", - method_table, NELEM(method_table))) { - ALOGE("Can't register UsbAlsaJackDetector native methods"); - return -1; - } - - return 0; + return jniRegisterNativeMethods(env, "com/android/server/usb/UsbAlsaJackDetector", + method_table, NELEM(method_table)); } }