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

Commit e7bdd58c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib43d1090d94be77ed5ed4de4f74782b8999271f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9574d7c eb1eb038

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