From 47b872d9c36347382dd24ad5c3f70490d8fcbb23 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 11 Jun 2015 12:47:24 -0700
Subject: Ignore some more generic USB device names.

Bug: 21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
---
 core/java/android/os/storage/DiskInfo.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java
index 04e54aafbce9..5bc45d572085 100644
--- a/core/java/android/os/storage/DiskInfo.java
+++ b/core/java/android/os/storage/DiskInfo.java
@@ -80,6 +80,12 @@ public class DiskInfo implements Parcelable {
         if (label.toLowerCase().contains("generic")) {
             return false;
         }
+        if (label.toLowerCase().startsWith("usb")) {
+            return false;
+        }
+        if (label.toLowerCase().startsWith("multiple")) {
+            return false;
+        }
         return true;
     }
 
-- 
cgit v1.2.3-59-g8ed1b