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 nyc-dev

Browse Source 
am: fd1bb10

* commit 'fd1bb10753c1f8b2de269cc6c1525cd3cfebc1e7':
  Remove old FUSE bypass now that we have sdcardfs.

Change-Id: Id15054a1e91b0ca107006b8a0b61a90ba98a1f4a
This commit is contained in:
Jeff Sharkey
2016-04-06 21:34:56 +00:00
committed by android-build-merger
parent e84072f6b0 fd1bb10753
commit edd2e60ae3
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

@@ -1178,23 +1178,7 @@ public class StorageManager {
/** {@hide} */ /** {@hide} */
public static File maybeTranslateEmulatedPathToInternal(File path) { public static File maybeTranslateEmulatedPathToInternal(File path) {
final IMountService mountService = IMountService.Stub.asInterface( // Disabled now that FUSE has been replaced by sdcardfs
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; return path;
} }