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

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

am: fd1bb107

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

Change-Id: Id15054a1e91b0ca107006b8a0b61a90ba98a1f4a
parents e84072f6 fd1bb107

core/java/android/os/storage/StorageManager.java

+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;

    }