Merge "usb: Fixed the null pointer issue" into tm-dev am: eb1eb03859 am: e7bdd58c84

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665877

Change-Id: I03660369454d0eea57d6e2f68af84cd68a291b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 11:12:44 +00:00
committed by Automerger Merge Worker

View File

@@ -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");