commit f834c282aa37115f94e8cc3aee43d05a90d3e0e0
author Amith Yamasani <yamasani@google.com> Wed Mar 04 18:04:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 04 18:04:02 2015 +0000
tree b5de3ff156aef81c07ca578e9845b09a5d861bbe
parent 2de257f0831ce296f0a27891504463ad10d864de
parent f4a8df4c7ee8d6a402e26339514cd73aba613105

Merge "Fix a regression in UsbDebuggingManager"

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