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

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

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

Change-Id: Ib43d1090d94be77ed5ed4de4f74782b8999271f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 08:52:28 +00:00
committed by Automerger Merge Worker
parent c9574d7c8e eb1eb03859
commit e7bdd58c84
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 @Override
public void onUEvent(UEventObserver.UEvent event) { public void onUEvent(UEventObserver.UEvent event) {
if (DEBUG) Slog.v(TAG, "USB UEVENT: " + event.toString()); 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 state = event.get("USB_STATE");
String accessory = event.get("ACCESSORY"); String accessory = event.get("ACCESSORY");