diff options
| author | 2015-03-04 18:04:01 +0000 | |
|---|---|---|
| committer | 2015-03-04 18:04:02 +0000 | |
| commit | f834c282aa37115f94e8cc3aee43d05a90d3e0e0 (patch) | |
| tree | b5de3ff156aef81c07ca578e9845b09a5d861bbe | |
| parent | 2de257f0831ce296f0a27891504463ad10d864de (diff) | |
| parent | f4a8df4c7ee8d6a402e26339514cd73aba613105 (diff) | |
Merge "Fix a regression in UsbDebuggingManager"
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDebuggingManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java index b3900b9062ec..8849acd11ab1 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 @@ 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); } |