Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-29 23:33:18 +00:00
committed by Android (Google) Code Review
parent 2d3e4b7437 18f325012d
commit ee1661f7cd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/os/storage/StorageManager.java
View File

@@ -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) {