From f4a8df4c7ee8d6a402e26339514cd73aba613105 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 4 Mar 2015 10:00:11 -0800
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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