commit bbaf48b386437add1de20b25dbb37511aab4c3da
author Mike Lockwood <lockwood@google.com> Fri Apr 24 22:03:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 24 22:03:06 2015 +0000
tree 36f8294d821c4f49709fd59cd0caec114413d2f1
parent 18191b4a52086168385f3d05877d5545b9e6ab59
parent 1f13872a01a02ffff93c24ece730a0136ee8757a

Merge "UsbAlsaManager: Fix NPE when running in emulator"

services/usb/java/com/android/server/usb/UsbAlsaManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index 8f0c6c8..daccf95 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
@@ -142,8 +142,10 @@
 
         // add existing alsa devices
         File[] files = new File(ALSA_DIRECTORY).listFiles();
-        for (int i = 0; i < files.length; i++) {
-            alsaFileAdded(files[i].getName());
+        if (files != null) {
+            for (int i = 0; i < files.length; i++) {
+                alsaFileAdded(files[i].getName());
+            }
         }
     }