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

Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev

Browse Source 
am: 6746aa8c4d

Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d
This commit is contained in:
Jeff Sharkey
2017-06-07 19:12:59 +00:00
committed by android-build-merger
parent dcbfba2a45 6746aa8c4d
commit 3471981ddc
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1403,23 +1403,7 @@ public class StorageManager {
/** {@hide} */ /** {@hide} */
public static File maybeTranslateEmulatedPathToInternal(File path) { public static File maybeTranslateEmulatedPathToInternal(File path) {
final IStorageManager storageManager = IStorageManager.Stub.asInterface( // Disabled now that FUSE has been replaced by sdcardfs
ServiceManager.getService("mount"));
try {
final VolumeInfo[] vols = storageManager.getVolumes(0);
for (VolumeInfo vol : vols) {
if ((vol.getType() == VolumeInfo.TYPE_EMULATED
|| vol.getType() == VolumeInfo.TYPE_PUBLIC) && vol.isMountedReadable()) {
final File internalPath = FileUtils.rewriteAfterRename(vol.getPath(),
vol.getInternalPath(), path);
if (internalPath != null && internalPath.exists()) {
return internalPath;
}
}
}
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
return path; return path;
} }