diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-06-11 19:57:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 19:57:25 +0000 |
| commit | c8488e99e85ae5252e6078c00d123f1364aef25d (patch) | |
| tree | 1abdf4517cabf4b6f5549e65b42eaedf6be4533d | |
| parent | e22c59b2913578c24e86673576d009d34306f6be (diff) | |
| parent | 47b872d9c36347382dd24ad5c3f70490d8fcbb23 (diff) | |
| download | frameworks_base-c8488e99e85ae5252e6078c00d123f1364aef25d.zip frameworks_base-c8488e99e85ae5252e6078c00d123f1364aef25d.tar.gz frameworks_base-c8488e99e85ae5252e6078c00d123f1364aef25d.tar.bz2 | |
Merge "Ignore some more generic USB device names." into mnc-dev
| -rw-r--r-- | core/java/android/os/storage/DiskInfo.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java index 04e54aa..5bc45d5 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; } |