commit f4a8df4c7ee8d6a402e26339514cd73aba613105
author Amith Yamasani <yamasani@google.com> Wed Mar 04 10:00:11 2015 -0800
committer Amith Yamasani <yamasani@google.com> Wed Mar 04 10:00:11 2015 -0800
tree 479f9a1120f3d731da22835d8878e13d90b88743
parent f55187767ed06acd52ddbc0e8de19b4d69db97bd

Fix a regression in UsbDebuggingManager

Catch NPE as well if socket object is null.

Bug: 19602060
Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f

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

diff --git a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java
index b3900b9..8849acd 100644
--- a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java
@@ -96,7 +96,7 @@
                 }
                 try {
                     listenToSocket();
-                } catch (IOException e) {
+                } catch (Exception e) {
                     /* Don't loop too fast if adbd dies, before init restarts it */
                     SystemClock.sleep(1000);
                 }