From c250e45eda7ab38c88b3e5e7e302917cd001d3af Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Mon, 11 Apr 2016 18:44:33 -0700
Subject: [PATCH] Make getStorageVolume(File file) public.

BUG: 27951594
Change-Id: I354f6a29b3fa3374ea07bcbe14096e9673d282c5
---
 api/current.txt                                  | 1 +
 api/system-current.txt                           | 1 +
 api/test-current.txt                             | 1 +
 core/java/android/os/storage/StorageManager.java | 8 +++++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index fbbb2e379743c..31a8cabd2e8aa 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29576,6 +29576,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);
diff --git a/api/system-current.txt b/api/system-current.txt
index d91f5d18a52c6..f19ad83699cae 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -31881,6 +31881,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);
diff --git a/api/test-current.txt b/api/test-current.txt
index bad973359337a..04469817a899e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -29643,6 +29643,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);
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index ece12280bb803..da215c61641a2 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -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) {