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

Commit 09594172 authored by Amith Yamasani's avatar Amith Yamasani Committed by The Android Automerger
Browse files

Fix a regression in UsbDebuggingManager 

Catch NPE as well if socket object is null.

Bug: 19602060
Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f
parent a75b281a

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class UsbDebuggingManager { 
                }

                try {

                    listenToSocket();

                } catch (IOException e) {

                } catch (Exception e) {

                    /* Don't loop too fast if adbd dies, before init restarts it */

                    SystemClock.sleep(1000);

                }