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

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

Browse Source 
am: 8b704d44

* commit '8b704d4474caf9fa0c7a734582fb6cce55248de4':
  Revert "Remove old FUSE bypass now that we have sdcardfs."

Change-Id: I65236959348e3a2781e82e9d56eecb58f5d7fcce
This commit is contained in:
Jeff Sharkey
2016-04-07 18:03:17 +00:00
committed by android-build-merger
parent 790dd5732f 8b704d4474
commit 0f7426090a
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1184,7 +1184,23 @@ public class StorageManager {
/** {@hide} */
public static File maybeTranslateEmulatedPathToInternal(File path) {
// Disabled now that FUSE has been replaced by sdcardfs
final IMountService mountService = IMountService.Stub.asInterface(
ServiceManager.getService("mount"));
try {
final VolumeInfo[] vols = mountService.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;
}