Fix for startup NPE.

Change-Id: I6928939d235faf544a85bb84bba2fa135ddc8e45

1 files changed, 3 insertions, 0 deletions

diff --git a/services/java/com/android/server/UsbObserver.java b/services/java/com/android/server/UsbObserver.java
index d08fe9b3964b..c36e6ca3103d 100644
--- a/services/java/com/android/server/UsbObserver.java
+++ b/services/java/com/android/server/UsbObserver.java
@@ -128,6 +128,9 @@ class UsbObserver extends UEventObserver {
 
         try {
             File[] files = new File(USB_COMPOSITE_CLASS_PATH).listFiles();
+            if (files == null) {
+                return; // nothing to do
+            }
             for (int i = 0; i < files.length; i++) {
                 File file = new File(files[i], "enable");
                 FileReader reader = new FileReader(file);