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

Commit 3471981d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 6746aa8c

Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d
parents dcbfba2a 6746aa8c
Loading
Loading
Loading
Loading
+1 −17
Original line number Diff line number Diff line
@@ -1403,23 +1403,7 @@ public class StorageManager {

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