Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd1bb107 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 3dc8a9f8 feef8b62
Loading
Loading
Loading
Loading
+1 −17
Original line number Diff line number Diff line
@@ -1178,23 +1178,7 @@ public class StorageManager {

    /** {@hide} */
    public static File maybeTranslateEmulatedPathToInternal(File path) {
        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();
        }
        // Disabled now that FUSE has been replaced by sdcardfs
        return path;
    }