From 975608fa0928b692bf1cdeee1481d56b735b7af6 Mon Sep 17 00:00:00 2001 From: Ricky Niu Date: Wed, 10 Nov 2021 17:59:40 +0800 Subject: [PATCH] usb: Fixed the null pointer issue Bug: 200323450 Test: Function work with reboot connect to PC and HU Signed-off-by: Ricky Niu Change-Id: I9bdfcda195c30d71d9d39e1170bbf66a7021c39b --- .../usb/java/com/android/server/usb/UsbDeviceManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index b2cc104834e66..1b07e9a69446f 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -237,7 +237,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser @Override public void onUEvent(UEventObserver.UEvent event) { if (DEBUG) Slog.v(TAG, "USB UEVENT: " + event.toString()); - sEventLogger.log(new UsbDeviceLogger.StringEvent("USB UEVENT: " + event.toString())); + if (sEventLogger != null) { + sEventLogger.log(new UsbDeviceLogger.StringEvent("USB UEVENT: " + + event.toString())); + } else { + if (DEBUG) Slog.d(TAG, "sEventLogger == null"); + } String state = event.get("USB_STATE"); String accessory = event.get("ACCESSORY");