Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-a48f52096e034a1e945d85dd74e1d766"

Browse Source 
* changes:
  [automerge] usb: Fixed the null pointer issue 2p: 975608fa09 2p: 41e7371744
  [automerge] usb: Fixed the null pointer issue 2p: 975608fa09
  usb: Fixed the null pointer issue
This commit is contained in:
TreeHugger Robot
2022-04-13 08:12:14 +00:00
committed by Android (Google) Code Review
parent 887f1f1909 78c11a6e28
commit 9c0812c466
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/usb/java/com/android/server/usb/UsbDeviceManager.java
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");