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

Commit 93c442e4 authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Make getStorageVolume(File file) public." into nyc-dev

parents 4db2f1f6 c250e45e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29584,6 +29584,7 @@ package android.os.storage { 
  public class StorageManager {

    method public java.lang.String getMountedObbPath(java.lang.String);

    method public android.os.storage.StorageVolume getPrimaryStorageVolume();

    method public android.os.storage.StorageVolume getStorageVolume(java.io.File);

    method public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();

    method public boolean isEncrypted(java.io.File);

    method public boolean isObbMounted(java.lang.String);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31890,6 +31890,7 @@ package android.os.storage { 
  public class StorageManager {

    method public java.lang.String getMountedObbPath(java.lang.String);

    method public android.os.storage.StorageVolume getPrimaryStorageVolume();

    method public android.os.storage.StorageVolume getStorageVolume(java.io.File);

    method public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();

    method public boolean isEncrypted(java.io.File);

    method public boolean isObbMounted(java.lang.String);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29653,6 +29653,7 @@ package android.os.storage { 
  public class StorageManager {

    method public java.lang.String getMountedObbPath(java.lang.String);

    method public android.os.storage.StorageVolume getPrimaryStorageVolume();

    method public android.os.storage.StorageVolume getStorageVolume(java.io.File);

    method public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();

    method public boolean isEncrypted(java.io.File);

    method public boolean isObbMounted(java.lang.String);

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

+7 −1
Original line number Diff line number Diff line
@@ -824,7 +824,9 @@ public class StorageManager { 
        }

    }



    /** {@hide} */

    /**

     * Return the {@link StorageVolume} that contains the given file, or {@code null} if none.

     */

    public @Nullable StorageVolume getStorageVolume(File file) {

        return getStorageVolume(getVolumeList(), file);

    }
@@ -836,9 +838,13 @@ public class StorageManager { 


    /** {@hide} */

    private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) {

        if (file == null) {

            return null;

        }

        try {

            file = file.getCanonicalFile();

        } catch (IOException ignored) {

            Slog.d(TAG, "Could not get canonical path for " + file);

            return null;

        }

        for (StorageVolume volume : volumes) {