From 1f13872a01a02ffff93c24ece730a0136ee8757a Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@google.com>
Date: Fri, 24 Apr 2015 14:56:32 -0700
Subject: [PATCH] UsbAlsaManager: Fix NPE when running in emulator

Bug: 20537358
Change-Id: I46693e45eb6127118cbd54fc3490dc58840b5797
---
 .../usb/java/com/android/server/usb/UsbAlsaManager.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index 8f0c6c8f27c5b..daccf959cadb8 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 @@ public final class UsbAlsaManager {
 
         // 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());
+            }
         }
     }