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

Merge "Better handling of storage paths." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-07-14 20:52:20 +00:00
committed by Android (Google) Code Review
parent 6eec00ecf4 983294596e
commit d3719ab07a
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ContextImpl.java
View File

@@ -1925,13 +1925,14 @@ class ContextImpl extends Context {
// enough permissions; ask vold to create on our behalf.
final IMountService mount = IMountService.Stub.asInterface(
ServiceManager.getService("mount"));
int res = -1;
try {
res = mount.mkdirs(getPackageName(), dir.getAbsolutePath());
} catch (Exception ignored) {
}
if (res != 0) {
Log.w(TAG, "Failed to ensure directory: " + dir);
final int res = mount.mkdirs(getPackageName(), dir.getAbsolutePath());
if (res != 0) {
Log.w(TAG, "Failed to ensure " + dir + ": " + res);
dir = null;
}
} catch (Exception e) {
Log.w(TAG, "Failed to ensure " + dir + ": " + e);
dir = null;
}
}

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

@@ -817,17 +817,19 @@ public class StorageManager {
/** {@hide} */
private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) {
File canonicalFile = null;
try {
canonicalFile = file.getCanonicalFile();
file = file.getCanonicalFile();
} catch (IOException ignored) {
canonicalFile = null;
return null;
}
for (StorageVolume volume : volumes) {
if (volume.getPathFile().equals(file)) {
return volume;
File volumeFile = volume.getPathFile();
try {
volumeFile = volumeFile.getCanonicalFile();
} catch (IOException ignored) {
continue;
}
if (FileUtils.contains(volume.getPathFile(), canonicalFile)) {
if (FileUtils.contains(volumeFile, file)) {
return volume;
}
}