Merge "UsbAlsaManager: Fix NPE when running in emulator"

2015-04-24 22:03:04 +00:00
parent 18191b4a52 1f13872a01
commit bbaf48b386
1 changed files with 4 additions and 2 deletions
--- 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());
+            }
        }
    }