diff options
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index bf20e6a82962..8905ad1e6abc 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -756,10 +756,15 @@ public class StorageManager { } try { for (VolumeInfo vol : mStorageManager.getVolumes(0)) { - if (vol.path != null && FileUtils.contains(vol.path, pathString)) { + if (vol.path != null && FileUtils.contains(vol.path, pathString) + && vol.type != VolumeInfo.TYPE_PUBLIC) { // TODO: verify that emulated adopted devices have UUID of // underlying volume - return convert(vol.fsUuid); + try { + return convert(vol.fsUuid); + } catch (IllegalArgumentException e) { + continue; + } } } } catch (RemoteException e) { |