summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-06-11 12:47:24 -0700
committerJeff Sharkey <jsharkey@android.com>2015-06-11 12:54:42 -0700
commit47b872d9c36347382dd24ad5c3f70490d8fcbb23 (patch)
tree5b8174e940ed5fa5d8e69666eeb16645dca00178 /core
parenta6e772c822b9095898b6611df0bedf95f445ca6e (diff)
downloadframeworks_base-47b872d9c36347382dd24ad5c3f70490d8fcbb23.zip
frameworks_base-47b872d9c36347382dd24ad5c3f70490d8fcbb23.tar.gz
frameworks_base-47b872d9c36347382dd24ad5c3f70490d8fcbb23.tar.bz2
Ignore some more generic USB device names.
Bug: 21376386 Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
Diffstat (limited to 'core')
-rw-r--r--core/java/android/os/storage/DiskInfo.java6
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;
}