Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e12157d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-a48f52096e034a1e945d85dd74e1d766" into tm-mainline-prod 

* changes:
  [automerge] usb: Fixed the null pointer issue 2p: 975608fa
  usb: Fixed the null pointer issue
parents 669a09a1 41e73717

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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");