From 5c14d32d56e5e74c9ada328e6053091685483c7c Mon Sep 17 00:00:00 2001 From: Jozef BABJAK Date: Tue, 19 Apr 2011 11:27:30 +0200 Subject: [PATCH] Fix for startup NPE. Change-Id: I6928939d235faf544a85bb84bba2fa135ddc8e45 --- services/java/com/android/server/UsbObserver.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/java/com/android/server/UsbObserver.java b/services/java/com/android/server/UsbObserver.java index d08fe9b3964b0..c36e6ca3103d1 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);